Merge pull request #20 from OpenCloudOS/dev

clean some compile warn in nettrace and nodetrace

Author: menglongdong

nodetrace/common.h

@@ -40,15 +40,14 @@ static inline int tc_attach(int prog_fd, char *nic, char *pref,
 		goto err;
 	}
 
-	sprintf(cmd, "tc filter show dev %s %s | grep tc_tmp |"
-		" tail -n 1 | awk '{print $5}'",
-		nic, filter);
-
 	/* get the filter entry that we added. 'pref' of it can be used
 	 * to delete it later.
 	 */
-	FILE *f = popen(cmd, "r");
-	fgets(pref, 16, f);
+	if (execf(pref, "tc filter show dev %s %s | grep tc_tmp |"
+		  " tail -n 1 | awk '{print $5}'", nic,
+		  filter))
+		pr_warn("failed to query pref of tc\n");
+
 	return 0;
 err:
 	return -1;
@@ -57,10 +56,13 @@ static inline int tc_attach(int prog_fd, char *nic, char *pref,
 static inline void tc_detach(char *nic, char *pref, bool ingress)
 {
 	char cmd[128], *filter;
+
 	filter = ingress ? "ingress": "egress";
 	snprintf(cmd, sizeof(cmd) - 1,
 		 "tc filter delete dev %s %s pref %s",
 		 nic, filter,
 		 pref);
-	system(cmd);
+
+	if (simple_exec(cmd))
+		pr_warn("failed to detach tc: %s\n", cmd);
 }

shared/pkt_utils.c

@@ -37,7 +37,7 @@ int ts_print_packet(char *buf, packet_t *pkt, char *minfo,
 
 	if (date_format) {
 		p = convert_ts_to_date(ts);
-		BUF_FMT("[%d-%d-%d %02d:%02d:%02d.%06d] ", 1900 + p->tm_year,
+		BUF_FMT("[%d-%d-%d %02d:%02d:%02d.%06lld] ", 1900 + p->tm_year,
 			1 + p->tm_mon, p->tm_mday, p->tm_hour, p->tm_min,
 			p->tm_sec, ts % 1000000000 / 1000);
 	} else {