svn commit: trunk/busybox/networking

vda at busybox.net vda at busybox.net
Wed Dec 26 21:49:36 UTC 2007


Author: vda
Date: 2007-12-26 13:49:33 -0800 (Wed, 26 Dec 2007)
New Revision: 20690

Log:
netstat: in error message, report filename and line number
where we see problematic data

   text    data     bss     dec     hex filename
 778456     832    7344  786632   c00c8 busybox_old
 778394     832    7344  786570   c008a busybox_unstripped




Modified:
   trunk/busybox/networking/netstat.c


Changeset:
Modified: trunk/busybox/networking/netstat.c
===================================================================
--- trunk/busybox/networking/netstat.c	2007-12-26 20:56:55 UTC (rev 20689)
+++ trunk/busybox/networking/netstat.c	2007-12-26 21:49:33 UTC (rev 20690)
@@ -148,7 +148,7 @@
 	return host_port;
 }
 
-static void tcp_do_one(int lnr, char *line)
+static int tcp_do_one(int lnr, char *line)
 {
 	char local_addr[64], rem_addr[64];
 	char more[512];
@@ -161,7 +161,7 @@
 	unsigned long rxq, txq, time_len, retr, inode;
 
 	if (lnr == 0)
-		return;
+		return 0;
 
 	more[0] = '\0';
 	num = sscanf(line,
@@ -171,8 +171,7 @@
 			&txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
 
 	if (num < 10) {
-		bb_error_msg("warning, got bogus tcp line");
-		return;
+		return 1; /* error */
 	}
 
 	if (strlen(local_addr) > 8) {
@@ -199,9 +198,10 @@
 		free(l);
 		free(r);
 	}
+	return 0;
 }
 
-static void udp_do_one(int lnr, char *line)
+static int udp_do_one(int lnr, char *line)
 {
 	char local_addr[64], rem_addr[64];
 	const char *state_str;
@@ -215,7 +215,7 @@
 	unsigned long rxq, txq, time_len, retr, inode;
 
 	if (lnr == 0)
-		return;
+		return 0;
 
 	more[0] = '\0';
 	num = sscanf(line,
@@ -236,8 +236,7 @@
 	}
 
 	if (num < 10) {
-		bb_error_msg("warning, got bogus udp line");
-		return;
+		return 1; /* error */
 	}
 	switch (state) {
 		case TCP_ESTABLISHED:
@@ -281,9 +280,10 @@
 			free(r);
 		}
 	}
+	return 0;
 }
 
-static void raw_do_one(int lnr, char *line)
+static int raw_do_one(int lnr, char *line)
 {
 	char local_addr[64], rem_addr[64];
 	char more[512];
@@ -296,7 +296,7 @@
 	unsigned long rxq, txq, time_len, retr, inode;
 
 	if (lnr == 0)
-		return;
+		return 0;
 
 	more[0] = '\0';
 	num = sscanf(line,
@@ -316,8 +316,7 @@
 	}
 
 	if (num < 10) {
-		bb_error_msg("warning, got bogus raw line");
-		return;
+		return 1; /* error */
 	}
 
 	{
@@ -337,9 +336,10 @@
 			free(r);
 		}
 	}
+	return 0;
 }
 
-static void unix_do_one(int nr, char *line)
+static int unix_do_one(int nr, char *line)
 {
 	unsigned long refcnt, proto, unix_flags;
 	unsigned long inode;
@@ -352,7 +352,7 @@
 	/* TODO: currently we stop at first NUL byte. Is it a problem? */
 
 	if (nr == 0)
-		return; /* skip header */
+		return 0; /* skip header */
 
 	*strchrnul(line, '\n') = '\0';
 
@@ -360,22 +360,21 @@
 	 * Other users report long lines filled by NUL bytes. 
 	 * (those ^@ are NUL bytes too). We see them as empty lines. */
 	if (!line[0])
-		return;
+		return 0;
 
 	path_ofs = 0; /* paranoia */
 	num = sscanf(line, "%p: %lX %lX %lX %X %X %lu %n",
 			&d, &refcnt, &proto, &unix_flags, &type, &state, &inode, &path_ofs);
 	if (num < 7) {
-		bb_error_msg("got bogus unix line '%s'", line);
-		return;
+		return 1; /* error */
 	}
 	if ((flags & (NETSTAT_LISTENING|NETSTAT_CONNECTED)) != (NETSTAT_LISTENING|NETSTAT_CONNECTED)) {
 		if ((state == SS_UNCONNECTED) && (unix_flags & SO_ACCEPTCON)) {
 			if (!(flags & NETSTAT_LISTENING))
-				return;
+				return 0;
 		} else {
 			if (!(flags & NETSTAT_CONNECTED))
-				return;
+				return 0;
 		}
 	}
 
@@ -447,6 +446,7 @@
 	printf("%-5s %-6ld %-11s %-10s %-13s %6lu %s\n",
 		ss_proto, refcnt, ss_flags, ss_type, ss_state, inode,
 		line + path_ofs);
+	return 0;
 }
 
 #define _PATH_PROCNET_UDP "/proc/net/udp"
@@ -457,7 +457,7 @@
 #define _PATH_PROCNET_RAW6 "/proc/net/raw6"
 #define _PATH_PROCNET_UNIX "/proc/net/unix"
 
-static void do_info(const char *file, const char *name, void (*proc)(int, char *))
+static void do_info(const char *file, const char *name, int (*proc)(int, char *))
 {
 	int lnr;
 	FILE *procinfo;
@@ -468,14 +468,15 @@
 		if (errno != ENOENT) {
 			bb_simple_perror_msg(file);
 		} else {
-			bb_error_msg("no support for '%s' on this system", name);
+			bb_error_msg("no kernel support for %s", name);
 		}
 		return;
 	}
 	lnr = 0;
 	/* Why? because xmalloc_fgets_str doesn't stop on NULs */
 	while ((buffer = xmalloc_fgets_str(procinfo, "\n")) != NULL) {
-		(proc)(lnr++, buffer);
+		if (proc(lnr++, buffer))
+			bb_error_msg("%s: bogus data on line %d", file, lnr);
 		free(buffer);
 	}
 	fclose(procinfo);




More information about the busybox-cvs mailing list