PATCH: netstat '-p' optional feature

L. Gabriel Somlo somlo at cmu.edu
Wed Jul 23 02:39:38 UTC 2008


On Tue, Jul 22, 2008 at 11:00:57PM +0200, Denys Vlasenko wrote:
> Can you do it?

Allright, how about this one ?

--Gabriel
-------------- next part --------------
diff -NarU5 busybox-svn-22735/include/usage.h busybox-svn-22735-netstatp/include/usage.h
--- busybox-svn-22735/include/usage.h	2008-07-09 23:04:08.000000000 -0400
+++ busybox-svn-22735-netstatp/include/usage.h	2008-07-16 20:37:41.000000000 -0400
@@ -2813,11 +2813,11 @@
 /*   "\nport numbers can be individual or ranges: lo-hi [inclusive]" */
 
 #endif
 
 #define netstat_trivial_usage \
-       "[-laentuwxr"USE_FEATURE_NETSTAT_WIDE("W")"]"
+       "[-laentuwxr"USE_FEATURE_NETSTAT_WIDE("W")USE_FEATURE_NETSTAT_PRG("p")"]"
 #define netstat_full_usage "\n\n" \
        "Display networking information\n" \
      "\nOptions:" \
      "\n	-l	Display listening server sockets" \
      "\n	-a	Display all sockets (default: connected)" \
@@ -2828,10 +2828,13 @@
      "\n	-w	Raw sockets" \
      "\n	-x	Unix sockets" \
      "\n	-r	Display routing table" \
 	USE_FEATURE_NETSTAT_WIDE( \
      "\n	-W	Display with no column truncation" \
+	) \
+	USE_FEATURE_NETSTAT_PRG( \
+     "\n	-p	Display PID/Program name for sockets" \
 	)
 
 #define nice_trivial_usage \
        "[-n ADJUST] [COMMAND [ARG]...]"
 #define nice_full_usage "\n\n" \
diff -NarU5 busybox-svn-22735/networking/Config.in busybox-svn-22735-netstatp/networking/Config.in
--- busybox-svn-22735/networking/Config.in	2008-07-09 23:04:03.000000000 -0400
+++ busybox-svn-22735-netstatp/networking/Config.in	2008-07-16 20:37:41.000000000 -0400
@@ -630,10 +630,17 @@
 	depends on NETSTAT
 	help
 	  Add support for wide columns. Useful when displaying IPv6 addresses
 	  (-W option).
 
+config FEATURE_NETSTAT_PRG
+	bool "Enable PID/Program name output"
+	default n
+	depends on NETSTAT
+	help
+	  Add support for -p flag to print out PID and program name.
+
 config NSLOOKUP
 	bool "nslookup"
 	default n
 	help
 	  nslookup is a tool to query Internet name servers.
diff -NarU5 busybox-svn-22735/networking/netstat.c busybox-svn-22735-netstatp/networking/netstat.c
--- busybox-svn-22735/networking/netstat.c	2008-07-09 23:04:03.000000000 -0400
+++ busybox-svn-22735-netstatp/networking/netstat.c	2008-07-22 22:32:52.000000000 -0400
@@ -6,22 +6,41 @@
  * Copyright (C) 2002 by Bart Visscher <magick at linux-fan.com>
  *
  * 2002-04-20
  * IPV6 support added by Bart Visscher <magick at linux-fan.com>
  *
+ * 2008-07-10
+ * optional '-p' flag support ported from net-tools by G. Somlo <somlo at cmu.edu>
+ *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include "libbb.h"
 #include "inet_common.h"
 
+#define NETSTAT_OPTS "laentuwx" \
+	USE_ROUTE(               "r") \
+	USE_FEATURE_NETSTAT_WIDE("W") \
+	USE_FEATURE_NETSTAT_PRG( "p")
+
 enum {
-	OPT_extended = 0x4,
-	OPT_showroute = 0x100,
-	OPT_widedisplay = 0x200 * ENABLE_FEATURE_NETSTAT_WIDE,
+	OPTBIT_KEEP_OLD = 7,
+	USE_ROUTE(               OPTBIT_ROUTE,)
+	USE_FEATURE_NETSTAT_WIDE(OPTBIT_WIDE ,)
+	USE_FEATURE_NETSTAT_PRG( OPTBIT_PRG  ,)
+	OPT_sock_listen = 1 << 0, // l
+	OPT_sock_all    = 1 << 1, // a
+	OPT_extended    = 1 << 2, // e
+	OPT_noresolve   = 1 << 3, // n
+	OPT_sock_tcp    = 1 << 4, // t
+	OPT_sock_udp    = 1 << 5, // u
+	OPT_sock_raw    = 1 << 6, // w
+	OPT_sock_unix   = 1 << 7, // x
+	OPT_route       = USE_ROUTE(               (1<<OPTBIT_ROUTE)) + 0, // r
+	OPT_wide        = USE_FEATURE_NETSTAT_WIDE((1<<OPTBIT_WIDE )) + 0, // W
+	OPT_prg         = USE_FEATURE_NETSTAT_PRG( (1<<OPTBIT_PRG  )) + 0, // p
 };
-# define NETSTAT_OPTS "laentuwxr"USE_FEATURE_NETSTAT_WIDE("W")
 
 #define NETSTAT_CONNECTED 0x01
 #define NETSTAT_LISTENING 0x02
 #define NETSTAT_NUMERIC   0x04
 /* Must match getopt32 option string */
@@ -29,11 +48,10 @@
 #define NETSTAT_UDP       0x20
 #define NETSTAT_RAW       0x40
 #define NETSTAT_UNIX      0x80
 #define NETSTAT_ALLPROTO  (NETSTAT_TCP|NETSTAT_UDP|NETSTAT_RAW|NETSTAT_UNIX)
 
-static smallint flags = NETSTAT_CONNECTED | NETSTAT_ALLPROTO;
 
 enum {
 	TCP_ESTABLISHED = 1,
 	TCP_SYN_SENT,
 	TCP_SYN_RECV,
@@ -42,26 +60,12 @@
 	TCP_TIME_WAIT,
 	TCP_CLOSE,
 	TCP_CLOSE_WAIT,
 	TCP_LAST_ACK,
 	TCP_LISTEN,
-	TCP_CLOSING /* now a valid state */
-};
-
-static const char *const tcp_state[] = {
-	"",
-	"ESTABLISHED",
-	"SYN_SENT",
-	"SYN_RECV",
-	"FIN_WAIT1",
-	"FIN_WAIT2",
-	"TIME_WAIT",
-	"CLOSE",
-	"CLOSE_WAIT",
-	"LAST_ACK",
-	"LISTEN",
-	"CLOSING"
+	TCP_CLOSING, /* now a valid state */
+	TCP_MAX_STATE
 };
 
 typedef enum {
 	SS_FREE = 0,     /* not allocated                */
 	SS_UNCONNECTED,  /* unconnected to any socket    */
@@ -74,25 +78,270 @@
 #define SO_WAITDATA  (1<<17)	/* wait data to read            */
 #define SO_NOSPACE   (1<<18)	/* no space to write            */
 
 /* Standard printout size */
 #define PRINT_IP_MAX_SIZE           23
-#define PRINT_NET_CONN              "%s   %6ld %6ld %-23s %-23s %-12s\n"
-#define PRINT_NET_CONN_HEADER       "\nProto Recv-Q Send-Q %-23s %-23s State\n"
+#define PRINT_NET_CONN              "%s   %6ld %6ld %-23s %-23s %-12s"
+#define PRINT_NET_CONN_HEADER       "\nProto Recv-Q Send-Q %-23s %-23s State      "
 
 /* When there are IPv6 connections the IPv6 addresses will be
  * truncated to none-recognition. The '-W' option makes the
  * address columns wide enough to accomodate for longest possible
  * IPv6 addresses, i.e. addresses of the form
  * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:ddd.ddd.ddd.ddd
  */
 #define PRINT_IP_MAX_SIZE_WIDE      51  /* INET6_ADDRSTRLEN + 5 for the port number */
-#define PRINT_NET_CONN_WIDE         "%s   %6ld %6ld %-51s %-51s %-12s\n"
-#define PRINT_NET_CONN_HEADER_WIDE  "\nProto Recv-Q Send-Q %-51s %-51s State\n"
+#define PRINT_NET_CONN_WIDE         "%s   %6ld %6ld %-51s %-51s %-12s"
+#define PRINT_NET_CONN_HEADER_WIDE  "\nProto Recv-Q Send-Q %-51s %-51s State      "
+
+#if ENABLE_FEATURE_NETSTAT_PRG
+
+#define PROGNAME_WIDTH 20
+#define PROGNAME_WIDTHs "%-20s"
+
+struct prg_node {
+	struct prg_node *next;
+	int inode;
+	char name[PROGNAME_WIDTH];
+};
+
+#define PRG_HASH_SIZE 211
+#define PRG_HASHIT(x) ((x) % PRG_HASH_SIZE)
+
+#endif
+
+struct globals {
+	smallint flags;
+	char *tcp_state[TCP_MAX_STATE];
+	char *net_conn_line;
+#if ENABLE_FEATURE_NETSTAT_PRG
+	struct prg_node *prg_hash[PRG_HASH_SIZE];
+	char prg_cache_loaded;
+	int prg_flag;
+#endif
+};
+
+#define G (*ptr_to_globals)
+#define flags         (G.flags)
+#define tcp_state     (G.tcp_state)
+#define net_conn_line (G.net_conn_line)
+
+#if ENABLE_FEATURE_NETSTAT_PRG
+
+#define prg_hash         (G.prg_hash)
+#define prg_cache_loaded (G.prg_cache_loaded)
+#define prg_flag         (G.prg_flag)
+
+#define INIT_PRG() do { \
+	prg_cache_loaded = 0; \
+	prg_flag = 0; \
+} while (0)
+
+#endif
+
+#define INIT_G() do { \
+	SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+	flags = NETSTAT_CONNECTED | NETSTAT_ALLPROTO; \
+	tcp_state[TCP_ESTABLISHED] = "ESTABLISHED"; \
+	tcp_state[TCP_SYN_SENT] = "SYN_SENT"; \
+	tcp_state[TCP_SYN_RECV] = "SYN_RECV"; \
+	tcp_state[TCP_FIN_WAIT1] = "FIN_WAIT1"; \
+	tcp_state[TCP_FIN_WAIT2] = "FIN_WAIT2"; \
+	tcp_state[TCP_TIME_WAIT] = "TIME_WAIT"; \
+	tcp_state[TCP_CLOSE] = "CLOSE"; \
+	tcp_state[TCP_CLOSE_WAIT] = "CLOSE_WAIT"; \
+	tcp_state[TCP_LAST_ACK] = "LAST_ACK"; \
+	tcp_state[TCP_LISTEN] = "LISTEN"; \
+	tcp_state[TCP_CLOSING] = "CLOSING"; \
+	net_conn_line = PRINT_NET_CONN; \
+} while (0)
+
+
+#if ENABLE_FEATURE_NETSTAT_PRG
+#define PROGNAME_BANNER "PID/Program name"
+
+#define print_progname_banner() do { if (prg_flag) printf(PROGNAME_WIDTHs," " PROGNAME_BANNER); } while (0)
+
+#define PRG_SOCKET_PFX   "socket:["
+#define PRG_SOCKET_PFXl  (sizeof(PRG_SOCKET_PFX)-1)
+#define PRG_SOCKET_PFX2  "[0000]:"
+#define PRG_SOCKET_PFX2l (sizeof(PRG_SOCKET_PFX2)-1)
+
+#define PATH_PROC      "/proc"
+#define PATH_FD_SUFF   "fd"
+#define PATH_FD_SUFFl  (sizeof(PATH_FD_SUFF)-1)
+#define PATH_PROC_X_FD PATH_PROC "/%s/" PATH_FD_SUFF
+#define PATH_CMDLINE   "cmdline"
+#define PATH_CMDLINEl  (sizeof(PATH_CMDLINE)-1)
+
+static void prg_cache_add(int inode, char *name)
+{
+	unsigned hi = PRG_HASHIT(inode);
+	struct prg_node **pnp, *pn;
+
+	prg_cache_loaded = 2;
+	for (pnp = prg_hash + hi; (pn = *pnp); pnp = &pn->next) {
+		if (pn->inode == inode) {
+			/* Some warning should be appropriate here
+			   as we got multiple processes for one i-node */
+			return;
+		}
+	}
+	*pnp = xmalloc(sizeof(struct prg_node));
+	pn = *pnp;
+	pn->next = NULL;
+	pn->inode = inode;
+	safe_strncpy(pn->name, name, PROGNAME_WIDTH);
+}
+
+static const char *prg_cache_get(int inode)
+{
+	unsigned hi = PRG_HASHIT(inode);
+	struct prg_node *pn;
+
+	for (pn = prg_hash[hi]; pn; pn = pn->next)
+		if (pn->inode == inode)
+			return pn->name;
+	return "-";
+}
+
+static void prg_cache_clear(void)
+{
+	struct prg_node **pnp, *pn;
+
+	if (prg_cache_loaded == 2)
+		for (pnp = prg_hash; pnp < prg_hash + PRG_HASH_SIZE; pnp++)
+			while ((pn = *pnp)) {
+				*pnp = pn->next;
+				free(pn);
+			}
+	prg_cache_loaded = 0;
+}
+
+static long extract_socket_inode(const char *lname) {
+
+	size_t llen = strlen(lname);
+	long inode = -1;
+
+	if (llen >= PRG_SOCKET_PFXl + 3 &&
+		memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl) == 0 &&
+		lname[llen - 1] == ']') {
 
-static const char *net_conn_line = PRINT_NET_CONN;
+		/* If lname is of the form "socket:[12345]",
+		 * extract the "12345" as inode.
+		 */
 
+		char inode_str[llen + 1];  /* e.g. "12345" */
+		const int inode_str_len = llen - PRG_SOCKET_PFXl - 1;
+
+		strncpy(inode_str, lname + PRG_SOCKET_PFXl, inode_str_len);
+		inode_str[inode_str_len] = '\0';
+		inode = bb_strtol(inode_str, NULL, 0);
+	} else if (llen >= PRG_SOCKET_PFX2l + 1 &&
+				memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l) == 0) {
+
+		/* If lname is of the form "[0000]:12345",
+		 * extract the "12345" as inode.
+		 */
+
+		inode = bb_strtol(lname + PRG_SOCKET_PFX2l, NULL, 0);
+	}
+
+	if (errno)	/* bb_strtol() encountered an error */
+		inode = -1;
+
+	return inode;
+}
+
+static void prg_cache_load(void)
+{
+	char line[LINE_MAX], eacces = 0;
+	int procfdlen, fd, cmdllen, lnamelen;
+	char lname[30], cmdlbuf[512], finbuf[PROGNAME_WIDTH];
+	long inode;
+	const char *cs, *cmdlp;
+	DIR *dir_proc = NULL, *dir_fd = NULL;
+	struct dirent *pde, *fde;
+
+	if (prg_cache_loaded)
+		return;
+	prg_cache_loaded = 1;
+
+	cmdlbuf[sizeof(cmdlbuf) - 1] = '\0';
+
+	dir_proc = opendir(PATH_PROC);
+	if (!dir_proc)
+		goto fail;
+	while ((pde = readdir(dir_proc))) {
+		for (cs = pde->d_name; *cs && isdigit(*cs); cs++)
+			continue;
+		if (*cs)
+			continue;
+		procfdlen = snprintf(line, sizeof(line),
+								PATH_PROC_X_FD, pde->d_name);
+		if (procfdlen <= 0 || procfdlen >= sizeof(line) - 5)
+			continue;
+		dir_fd = opendir(line);
+		if (!dir_fd) {
+			if (errno == EACCES)
+				eacces = 1;
+			continue;
+		}
+		line[procfdlen] = '/';
+		cmdlp = NULL;
+		while ((fde = readdir(dir_fd))) {
+			if ( procfdlen + 1 + strlen(fde->d_name) + 1 > sizeof(line)) 
+				continue;
+			memcpy(line + procfdlen - PATH_FD_SUFFl, PATH_FD_SUFF "/",
+					PATH_FD_SUFFl + 1);
+			strcpy(line + procfdlen + 1, fde->d_name);
+			lnamelen=readlink(line, lname, sizeof(lname) - 1);
+			lname[lnamelen] = '\0';  /*make it a null-terminated string*/
+
+			inode = extract_socket_inode(lname);
+			if (inode < 0)
+				continue;
+
+			if (!cmdlp) {
+				if (procfdlen - PATH_FD_SUFFl + PATH_CMDLINEl >=
+						sizeof(line) - 5) continue;
+				strcpy(line + procfdlen-PATH_FD_SUFFl, PATH_CMDLINE);
+				fd = open(line, O_RDONLY);
+				if (fd < 0) continue;
+				cmdllen = read(fd, cmdlbuf, sizeof(cmdlbuf) - 1);
+				if (close(fd) || cmdllen == -1) continue;
+				if (cmdllen < sizeof(cmdlbuf) - 1) 
+					cmdlbuf[cmdllen] = '\0';
+				if ((cmdlp = strrchr(cmdlbuf, '/'))) 
+					cmdlp++;
+				else 
+					cmdlp = cmdlbuf;
+			}
+
+			snprintf(finbuf, sizeof(finbuf), "%s/%s", pde->d_name, cmdlp);
+			prg_cache_add(inode, finbuf);
+		}
+		closedir(dir_fd); 
+		dir_fd = NULL;
+	}
+	if (dir_proc)
+		closedir(dir_proc);
+	if (dir_fd)
+		closedir(dir_fd);
+	if (!eacces)
+		return;
+	if (prg_cache_loaded == 1) {
+fail:
+		fprintf(stderr, "(No info could be read for \"-p\": geteuid()=%d "
+						"but you should be root.)\n", geteuid());
+	} else
+		fprintf(stderr, "(Not all processes could be identified, "
+						"non-owned process info will not be shown, "
+						"you would have to be root to see it all.)\n");
+}
+
+#endif //ENABLE_FEATURE_NETSTAT_PRG
 
 #if ENABLE_FEATURE_IPV6
 static void build_ipv6_addr(char* local_addr, struct sockaddr_in6* localaddr)
 {
 	char addr6[INET6_ADDRSTRLEN];
@@ -193,10 +442,15 @@
 		char *r = ip_port_str(
 				(struct sockaddr *) &remaddr, rem_port,
 				"tcp", flags & NETSTAT_NUMERIC);
 		printf(net_conn_line,
 			"tcp", rxq, txq, l, r, tcp_state[state]);
+#if ENABLE_FEATURE_NETSTAT_PRG
+		if (prg_flag)
+			printf(PROGNAME_WIDTHs, prg_cache_get(inode));
+#endif
+		printf("\n");
 		free(l);
 		free(r);
 	}
 	return 0;
 }
@@ -274,10 +528,15 @@
 			char *r = ip_port_str(
 				(struct sockaddr *) &remaddr, rem_port,
 				"udp", flags & NETSTAT_NUMERIC);
 			printf(net_conn_line,
 				"udp", rxq, txq, l, r, state_str);
+#if ENABLE_FEATURE_NETSTAT_PRG
+			if (prg_flag)
+				printf(PROGNAME_WIDTHs, prg_cache_get(inode));
+#endif
+			printf("\n");
 			free(l);
 			free(r);
 		}
 	}
 	return 0;
@@ -330,10 +589,15 @@
 			char *r = ip_port_str(
 				(struct sockaddr *) &remaddr, rem_port,
 				"raw", flags & NETSTAT_NUMERIC);
 			printf(net_conn_line,
 				"raw", rxq, txq, l, r, itoa(state));
+#if ENABLE_FEATURE_NETSTAT_PRG
+			if (prg_flag)
+				printf(PROGNAME_WIDTHs, prg_cache_get(inode));
+#endif
+			printf("\n");
 			free(l);
 			free(r);
 		}
 	}
 	return 0;
@@ -441,10 +705,15 @@
 
 	printf("%-5s %-6ld %-11s %-10s %-13s %6lu ",
 		ss_proto, refcnt, ss_flags, ss_type, ss_state, inode
 		);
 
+#if ENABLE_FEATURE_NETSTAT_PRG
+	if (prg_flag)
+		printf(PROGNAME_WIDTHs, prg_cache_get(inode));
+#endif
+
 	/* TODO: currently we stop at first NUL byte. Is it a problem? */
 	line += path_ofs;
 	*strchrnul(line, '\n') = '\0';
 	while (*line)
 		fputc_printable(*line++, stdout);
@@ -495,10 +764,15 @@
 	smallint inet6 = 1;
 #else
 	enum { inet = 1, inet6 = 0 };
 #endif
 
+	INIT_G();
+#if ENABLE_FEATURE_NETSTAT_PRG
+	INIT_PRG();
+#endif
+
 	/* Option string must match NETSTAT_xxx constants */
 	opt = getopt32(argv, NETSTAT_OPTS);
 	if (opt & 0x1) { // -l
 		flags &= ~NETSTAT_CONNECTED;
 		flags |= NETSTAT_LISTENING;
@@ -508,24 +782,25 @@
 	if (opt & 0x8) flags |= NETSTAT_NUMERIC; // -n
 	//if (opt & 0x10) // -t: NETSTAT_TCP
 	//if (opt & 0x20) // -u: NETSTAT_UDP
 	//if (opt & 0x40) // -w: NETSTAT_RAW
 	//if (opt & 0x80) // -x: NETSTAT_UNIX
-	if (opt & OPT_showroute) { // -r
-#if ENABLE_ROUTE
+	if (opt & OPT_route) { // -r
 		bb_displayroutes(flags & NETSTAT_NUMERIC, !(opt & OPT_extended));
 		return 0;
-#else
-		bb_show_usage();
-#endif
 	}
 
-	if (opt & OPT_widedisplay) { // -W
+	if (opt & OPT_wide) { // -W
 		net_conn_line = PRINT_NET_CONN_WIDE;
 		net_conn_line_header = PRINT_NET_CONN_HEADER_WIDE;
 	}
 
+	if (opt & OPT_prg) { // -p
+		prg_flag = 1;
+		prg_cache_load();
+	}
+
 	opt &= NETSTAT_ALLPROTO;
 	if (opt) {
 		flags &= ~NETSTAT_ALLPROTO;
 		flags |= opt;
 	}
@@ -537,10 +812,14 @@
 		else if (flags & NETSTAT_LISTENING)
 			printf("(only servers)");
 		else
 			printf("(w/o servers)");
 		printf(net_conn_line_header, "Local Address", "Foreign Address");
+#if ENABLE_FEATURE_NETSTAT_PRG
+		print_progname_banner();
+#endif
+		printf("\n");
 	}
 	if (inet && flags & NETSTAT_TCP)
 		do_info(_PATH_PROCNET_TCP, "AF INET (tcp)", tcp_do_one);
 #if ENABLE_FEATURE_IPV6
 	if (inet6 && flags & NETSTAT_TCP)
@@ -564,10 +843,17 @@
 			printf("(servers and established)");
 		else if (flags & NETSTAT_LISTENING)
 			printf("(only servers)");
 		else
 			printf("(w/o servers)");
-		printf("\nProto RefCnt Flags       Type       State         I-Node Path\n");
+		printf("\nProto RefCnt Flags       Type       State         I-Node");
+#if ENABLE_FEATURE_NETSTAT_PRG
+		print_progname_banner();
+#endif
+		printf(" Path\n");
 		do_info(_PATH_PROCNET_UNIX, "AF UNIX", unix_do_one);
 	}
+#if ENABLE_FEATURE_NETSTAT_PRG
+	prg_cache_clear();
+#endif
 	return 0;
 }


More information about the busybox mailing list