socsvn commit: r269849 - soc2014/zkorchev/freebsd_head/usr.bin/netstat

zkorchev at FreeBSD.org zkorchev at FreeBSD.org
Sun Jun 22 12:03:02 UTC 2014


Author: zkorchev
Date: Sun Jun 22 12:02:57 2014
New Revision: 269849
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269849

Log:
  code improvements

Modified:
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/bpf.c
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/flowtable.c
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/if.c
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/inet.c
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/inet6.c
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/main.c
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/mbuf.c
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/mroute.c
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/mroute6.c
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/netisr.c
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/netstat.h
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/route.c
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/unix.c

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/bpf.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/bpf.c	Sun Jun 22 11:32:23 2014	(r269848)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/bpf.c	Sun Jun 22 12:02:57 2014	(r269849)
@@ -123,7 +123,7 @@
 	}
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 		sol_map_start(&sol_stream);
 	else
 #endif
@@ -140,7 +140,7 @@
 		bpf_flags(d, flagbuf);
 		pname = bpf_pidname(d->bd_pid);
 #if defined(SOL_ON)
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, "pid", 3);
 		sol_integer(&sol_stream, d->bd_pid);
 
@@ -179,7 +179,7 @@
 	free(bd);
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 		sol_map_end(&sol_stream);
 #endif
 }

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/flowtable.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/flowtable.c	Sun Jun 22 11:32:23 2014	(r269848)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/flowtable.c	Sun Jun 22 12:02:57 2014	(r269849)
@@ -46,7 +46,7 @@
 {
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
 		sol_map_start(&sol_stream);
 
@@ -102,7 +102,7 @@
 
 	if (sysctlbyname("net.flowtable.ip4.stat", &stat, &len, NULL, 0) == 0) {
 #if defined(SOL_ON)
-		if (Oflag)
+		if (sol_format)
 			SOL_MAP_KEYL(&sol_stream, "IPv4");
 		else
 #endif
@@ -112,7 +112,7 @@
 
 	if (sysctlbyname("net.flowtable.ip6.stat", &stat, &len, NULL, 0) == 0) {
 #if defined(SOL_ON)
-		if (Oflag)
+		if (sol_format)
 			SOL_MAP_KEYL(&sol_stream, "IPv6");
 		else
 #endif

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/if.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/if.c	Sun Jun 22 11:32:23 2014	(r269848)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/if.c	Sun Jun 22 12:02:57 2014	(r269849)
@@ -251,7 +251,7 @@
 		err(EX_OSERR, "getifmaddrs");
 
 #if defined(SOL_ON)
-	if (Oflag) {
+	if (sol_format) {
 		SOL_MAP_KEYL(&sol_stream, "network");
 		sol_array_start(&sol_stream);
 	}
@@ -301,7 +301,7 @@
 			continue;
 
 #if defined(SOL_ON)
-		if (Oflag) {
+		if (sol_format) {
 			sol_map_start(&sol_stream);
 
 			SOL_MAP_KEYL(&sol_stream, "name");
@@ -325,7 +325,7 @@
 		switch (ifa->ifa_addr->sa_family) {
 		case AF_UNSPEC:
 #if defined(SOL_ON)
-			if (!Oflag)
+			if (!sol_format)
 #endif
 			{
 				printf("%-13.13s ", "none");
@@ -339,7 +339,7 @@
 			sin = (struct sockaddr_in *)ifa->ifa_addr;
 			mask = (struct sockaddr_in *)ifa->ifa_netmask;
 #if defined(SOL_ON)
-			if (Oflag)
+			if (sol_format)
 			{
 				char *network = netname(sin->sin_addr.s_addr, mask->sin_addr.s_addr);
 				char *address = routename(sin->sin_addr.s_addr);
@@ -369,7 +369,7 @@
 			mask = (struct sockaddr_in6 *)ifa->ifa_netmask;
 
 #if defined(SOL_ON)
-			if (Oflag)
+			if (sol_format)
 			{
 				const char *network = netname6(sin6, &mask->sin6_addr);
 				SOL_MAP_KEYL(&sol_stream, "network");
@@ -403,7 +403,7 @@
 			n = sdl->sdl_alen;
 			m = sprintf(linknum, "<Link#%d>", sdl->sdl_index);
 #if defined(SOL_ON)
-			if (Oflag)
+			if (sol_format)
 			{
 				char buf[64]; // TODO make sure this is enough
 				size_t len = 0;
@@ -439,7 +439,7 @@
 #define	IFA_STAT(s)	(((struct if_data *)ifa->ifa_data)->ifi_ ## s)
 
 #if defined(SOL_ON)
-		if (Oflag)
+		if (sol_format)
 		{
 			SOL_MAP_KEYL(&sol_stream, "input");
 			sol_map_start(&sol_stream);
@@ -496,7 +496,7 @@
 
 		if (!aflag) {
 #if defined(SOL_ON)
-			if (Oflag) sol_map_end(&sol_stream);
+			if (sol_format) sol_map_end(&sol_stream);
 #endif
 			continue;
 		}
@@ -505,7 +505,7 @@
 		 * Print family's multicast addresses.
 		 */
 #if defined(SOL_ON)
-		if (Oflag) {
+		if (sol_format) {
 			SOL_MAP_KEYL(&sol_stream, "multicast");
 			sol_array_start(&sol_stream);
 		}
@@ -534,7 +534,7 @@
 				    ifma->ifma_addr->sa_len, addr_buf,
 				    sizeof(addr_buf), 0, 0, NI_NUMERICHOST);
 #if defined(SOL_ON)
-				if (Oflag)
+				if (sol_format)
 					sol_string(&sol_stream, addr_buf, strlen(addr_buf));
 				else
 #endif
@@ -560,7 +560,7 @@
 
 			if (fmt) {
 #if defined(SOL_ON)
-				if (Oflag)
+				if (sol_format)
 				{
 					sol_map_start(&sol_stream);
 					SOL_MAP_KEYL(&sol_stream, "address");
@@ -590,7 +590,7 @@
 			ifma = ifma->ifma_next;
 		}
 #if defined(SOL_ON)
-		if (Oflag) {
+		if (sol_format) {
 			sol_array_end(&sol_stream);
 			sol_map_end(&sol_stream);
 		}
@@ -602,7 +602,7 @@
 		freeifmaddrs(ifmap);
 
 #if defined(SOL_ON)
-	if (Oflag) sol_array_end(&sol_stream);
+	if (sol_format) sol_array_end(&sol_stream);
 #endif
 }
 

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/inet.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/inet.c	Sun Jun 22 11:32:23 2014	(r269848)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/inet.c	Sun Jun 22 12:02:57 2014	(r269849)
@@ -349,7 +349,7 @@
 	}
 
 #if defined(SOL_ON)
-	if (Oflag) first = 0;
+	if (sol_format) first = 0;
 #endif
 
 	oxig = xig = (struct xinpgen *)buf;
@@ -456,11 +456,11 @@
 		if (Lflag && so->so_qlimit == 0)
 			continue;
 #if defined(SOL_ON)
-		if (Oflag) sol_map_start(&sol_stream);
+		if (sol_format) sol_map_start(&sol_stream);
 #endif
 		if (Aflag) {
 #if defined(SOL_ON)
-			if (Oflag) {
+			if (sol_format) {
 				SOL_MAP_KEYL(&sol_stream, "socket");
 				if (istcp)
 					sol_uinteger(&sol_stream, (u_long)inp->inp_ppcb);
@@ -483,7 +483,7 @@
 		vchar = ((inp->inp_vflag & INP_IPV4) != 0) ?
 		    "4 " : "  ";
 #if defined(SOL_ON)
-		if (Oflag)
+		if (sol_format)
 		{
 			char proto[5 + 1];
 			size_t len;
@@ -547,13 +547,13 @@
 		if (numeric_port) {
 			if (inp->inp_vflag & INP_IPV4) {
 #if defined(SOL_ON)
-				if (Oflag) SOL_MAP_KEYL(&sol_stream, "local address");
+				if (sol_format) SOL_MAP_KEYL(&sol_stream, "local address");
 #endif
 				inetprint(&inp->inp_laddr, (int)inp->inp_lport,
 				    name, 1);
 				if (!Lflag) {
 #if defined(SOL_ON)
-					if (Oflag) SOL_MAP_KEYL(&sol_stream, "foreign address");
+					if (sol_format) SOL_MAP_KEYL(&sol_stream, "foreign address");
 #endif
 					inetprint(&inp->inp_faddr,
 					    (int)inp->inp_fport, name, 1);
@@ -562,13 +562,13 @@
 #ifdef INET6
 			else if (inp->inp_vflag & INP_IPV6) {
 #if defined(SOL_ON)
-				if (Oflag) SOL_MAP_KEYL(&sol_stream, "local address");
+				if (sol_format) SOL_MAP_KEYL(&sol_stream, "local address");
 #endif
 				inet6print(&inp->in6p_laddr,
 				    (int)inp->inp_lport, name, 1);
 				if (!Lflag) {
 #if defined(SOL_ON)
-					if (Oflag) SOL_MAP_KEYL(&sol_stream, "foreign address");
+					if (sol_format) SOL_MAP_KEYL(&sol_stream, "foreign address");
 #endif
 					inet6print(&inp->in6p_faddr,
 					    (int)inp->inp_fport, name, 1);
@@ -578,13 +578,13 @@
 		} else if (inp->inp_flags & INP_ANONPORT) {
 			if (inp->inp_vflag & INP_IPV4) {
 #if defined(SOL_ON)
-				if (Oflag) SOL_MAP_KEYL(&sol_stream, "local address");
+				if (sol_format) SOL_MAP_KEYL(&sol_stream, "local address");
 #endif
 				inetprint(&inp->inp_laddr, (int)inp->inp_lport,
 				    name, 1);
 				if (!Lflag) {
 #if defined(SOL_ON)
-					if (Oflag) SOL_MAP_KEYL(&sol_stream, "foreign address");
+					if (sol_format) SOL_MAP_KEYL(&sol_stream, "foreign address");
 #endif
 					inetprint(&inp->inp_faddr,
 					    (int)inp->inp_fport, name, 0);
@@ -593,13 +593,13 @@
 #ifdef INET6
 			else if (inp->inp_vflag & INP_IPV6) {
 #if defined(SOL_ON)
-				if (Oflag) SOL_MAP_KEYL(&sol_stream, "local address");
+				if (sol_format) SOL_MAP_KEYL(&sol_stream, "local address");
 #endif
 				inet6print(&inp->in6p_laddr,
 				    (int)inp->inp_lport, name, 1);
 				if (!Lflag) {
 #if defined(SOL_ON)
-					if (Oflag) SOL_MAP_KEYL(&sol_stream, "foreign address");
+					if (sol_format) SOL_MAP_KEYL(&sol_stream, "foreign address");
 #endif
 					inet6print(&inp->in6p_faddr,
 					    (int)inp->inp_fport, name, 0);
@@ -609,13 +609,13 @@
 		} else {
 			if (inp->inp_vflag & INP_IPV4) {
 #if defined(SOL_ON)
-				if (Oflag) SOL_MAP_KEYL(&sol_stream, "local address");
+				if (sol_format) SOL_MAP_KEYL(&sol_stream, "local address");
 #endif
 				inetprint(&inp->inp_laddr, (int)inp->inp_lport,
 				    name, 0);
 				if (!Lflag) {
 #if defined(SOL_ON)
-					if (Oflag) SOL_MAP_KEYL(&sol_stream, "foreign address");
+					if (sol_format) SOL_MAP_KEYL(&sol_stream, "foreign address");
 #endif
 					inetprint(&inp->inp_faddr,
 					    (int)inp->inp_fport, name,
@@ -625,13 +625,13 @@
 #ifdef INET6
 			else if (inp->inp_vflag & INP_IPV6) {
 #if defined(SOL_ON)
-				if (Oflag) SOL_MAP_KEYL(&sol_stream, "local address");
+				if (sol_format) SOL_MAP_KEYL(&sol_stream, "local address");
 #endif
 				inet6print(&inp->in6p_laddr,
 				    (int)inp->inp_lport, name, 0);
 				if (!Lflag) {
 #if defined(SOL_ON)
-					if (Oflag) SOL_MAP_KEYL(&sol_stream, "foreign address");
+					if (sol_format) SOL_MAP_KEYL(&sol_stream, "foreign address");
 #endif
 					inet6print(&inp->in6p_faddr,
 					    (int)inp->inp_fport, name,
@@ -641,7 +641,7 @@
 #endif /* INET6 */
 		}
 #if defined(SOL_ON)
-		if (Oflag)
+		if (sol_format)
 		{
 			if (xflag) {
 				SOL_MAP_KEYL(&sol_stream, "recv mcnt");
@@ -758,10 +758,10 @@
 		}
 	}
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
-		sol_map_start(&sol_stream);
 		if (xig != oxig && xig->xig_gen != oxig->xig_gen) {
+			sol_map_start(&sol_stream);
 			if (oxig->xig_count > xig->xig_count)
 				SOL_MAP_KEYL(&sol_stream, "maybe deleted");
 			else if (oxig->xig_count < xig->xig_count)
@@ -769,8 +769,8 @@
 			else
 				SOL_MAP_KEYL(&sol_stream, "maybe created/deleted");
 			sol_string(&sol_stream, name, strlen(name));
+			sol_map_end(&sol_stream);
 		}
-		sol_map_end(&sol_stream);
 	}
 	else
 #endif
@@ -825,7 +825,7 @@
 	sol_integer(&sol_stream, (uintmax_t )tcpstat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, name, strlen(name));
 		sol_map_start(&sol_stream);
 
@@ -1141,7 +1141,7 @@
 		sol_integer(&sol_stream, (uintmax_t)udpstat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, name, strlen(name));
 		sol_map_start(&sol_stream);
 
@@ -1231,7 +1231,7 @@
 		sol_integer(&sol_stream, (uintmax_t)carpstat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, name, strlen(name));
 		sol_map_start(&sol_stream);
 
@@ -1325,7 +1325,7 @@
 		sol_integer(&sol_stream, (uintmax_t)ipstat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, name, strlen(name));
 		sol_map_start(&sol_stream);
 
@@ -1436,7 +1436,7 @@
 		sol_integer(&sol_stream, (uintmax_t)arpstat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, name, strlen(name));
 		sol_map_start(&sol_stream);
 
@@ -1549,7 +1549,7 @@
 		sol_integer(&sol_stream, (uintmax_t)icmpstat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, name, strlen(name));
 		sol_map_start(&sol_stream);
 
@@ -1707,7 +1707,7 @@
 		sol_integer(&sol_stream, oigmpstat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, name, strlen(name));
 		sol_map_start(&sol_stream);
 
@@ -1819,7 +1819,7 @@
 		sol_integer(&sol_stream, (uintmax_t)igmpstat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, name, strlen(name));
 		sol_map_start(&sol_stream);
 
@@ -1916,7 +1916,7 @@
 		sol_integer(&sol_stream, (uintmax_t)pimstat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, name, strlen(name));
 		sol_map_start(&sol_stream);
 
@@ -1990,7 +1990,7 @@
 		sprintf(cp, "%d ", ntohs((u_short)port));
 	width = (Aflag && !Wflag) ? 18 : 22;
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 		sol_string(&sol_stream, line, strlen(line));
 	else
 #endif

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/inet6.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/inet6.c	Sun Jun 22 11:32:23 2014	(r269848)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/inet6.c	Sun Jun 22 12:02:57 2014	(r269849)
@@ -392,7 +392,7 @@
 		sol_integer(&sol_stream, (uintmax_t)ip6stat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		char key[STRBUF_SIZEOF(uintmax_t) + 1];
 		size_t len;
 
@@ -737,7 +737,7 @@
 		sol_integer(&sol_stream, (uintmax_t)ifr.ifr_ifru.ifru_stat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, ifr.ifr_name, strlen(ifr.ifr_name));
 		sol_map_start(&sol_stream);
 
@@ -1103,7 +1103,7 @@
 		sol_integer(&sol_stream, (uintmax_t)icmp6stat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, name, strlen(name));
 		sol_map_start(&sol_stream);
 
@@ -1266,7 +1266,7 @@
 		sol_integer(&sol_stream, (uintmax_t)ifr.ifr_ifru.ifru_icmp6stat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, ifr.ifr_name, strlen(ifr.ifr_name));
 		sol_map_start(&sol_stream);
 
@@ -1391,7 +1391,7 @@
 		sol_integer(&sol_stream, (uintmax_t)pim6stat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, name, strlen(name));
 		sol_map_start(&sol_stream);
 
@@ -1459,7 +1459,7 @@
 		sol_integer(&sol_stream, (uintmax_t)rip6stat.f); \
 	} while (0)
 
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, name, strlen(name));
 		sol_map_start(&sol_stream);
 
@@ -1531,7 +1531,7 @@
 	else
 		sprintf(cp, "%d", ntohs((u_short)port));
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 		sol_string(&sol_stream, line, strlen(line));
 	else
 #endif

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/main.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/main.c	Sun Jun 22 11:32:23 2014	(r269848)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/main.c	Sun Jun 22 12:02:57 2014	(r269849)
@@ -293,7 +293,6 @@
 int	noutputs = 0;	/* how much outputs before we exit */
 int	numeric_addr;	/* show addresses numerically */
 int	numeric_port;	/* show ports numerically */
-int Oflag;			/* use JSON as output format */
 static int pflag;	/* show given protocol */
 int	Qflag;		/* show netisr information */
 int	rflag;		/* show routing tables (or routing stats) */
@@ -304,6 +303,7 @@
 int	xflag;		/* extra information, includes all socket buffer info */
 int	zflag;		/* zero stats */
 
+int	sol_format;		/* use libsol for output */
 #if defined(SOL_ON)
 struct sol_stream sol_stream;
 #endif
@@ -495,7 +495,7 @@
 #endif
 
 #if defined(SOL_ON)
-	Oflag = sol_init(&sol_stream);
+	sol_format = sol_init(&sol_stream);
 #endif
 
 	/*
@@ -514,7 +514,7 @@
 			usage();
 		bpf_stats(interface);
 #if defined(SOL_ON)
-		if (Oflag) sol_term(&sol_stream);
+		if (sol_format) sol_term(&sol_stream);
 #endif
 		exit(0);
 	}
@@ -525,7 +525,7 @@
 		} else
 			mbpr(NULL, 0);
 #if defined(SOL_ON)
-		if (Oflag) sol_term(&sol_stream);
+		if (sol_format) sol_term(&sol_stream);
 #endif
 		exit(0);
 	}
@@ -536,7 +536,7 @@
 		} else
 			netisr_stats(NULL);
 #if defined(SOL_ON)
-		if (Oflag) sol_term(&sol_stream);
+		if (sol_format) sol_term(&sol_stream);
 #endif
 		exit(0);
 	}
@@ -556,7 +556,7 @@
 #endif
 	if (iflag && !sflag) {
 #if defined(SOL_ON)
-		if (Oflag) {
+		if (sol_format) {
 			sol_map_start(&sol_stream);
 			intpr(interval, NULL, af);
 			sol_map_end(&sol_stream);
@@ -569,7 +569,7 @@
 	}
 	if (rflag) {
 #if defined(SOL_ON)
-		if (Oflag) sol_map_start(&sol_stream);
+		if (sol_format) sol_map_start(&sol_stream);
 #endif
 		if (sflag) {
 			rt_stats();
@@ -577,7 +577,7 @@
 		} else
 			routepr(fib, af);
 #if defined(SOL_ON)
-		if (Oflag) {
+		if (sol_format) {
 			sol_map_end(&sol_stream);
 			sol_term(&sol_stream);
 		}
@@ -586,7 +586,7 @@
 	}
 
 #if defined(SOL_ON)
-	if (Oflag) sol_map_start(&sol_stream);
+	if (sol_format) sol_map_start(&sol_stream);
 #endif
 
 	if (gflag) {
@@ -606,7 +606,7 @@
 #endif
 		}
 #if defined(SOL_ON)
-		if (Oflag) {
+		if (sol_format) {
 			sol_map_end(&sol_stream);
 			sol_term(&sol_stream);
 		}
@@ -618,7 +618,7 @@
 	kresolve_list(nl);
 
 #if defined(SOL_ON)
-	if (Oflag) {
+	if (sol_format) {
 		SOL_MAP_KEYL(&sol_stream, "internet");
 		sol_array_start(&sol_stream);
 	}
@@ -627,7 +627,7 @@
 	if (tp) {
 		printproto(tp, tp->pr_name);
 #if defined(SOL_ON)
-		if (Oflag) {
+		if (sol_format) {
 			sol_array_end(&sol_stream);
 			sol_map_end(&sol_stream);
 			sol_term(&sol_stream);
@@ -654,14 +654,14 @@
 			printproto(tp, tp->pr_name);
 #endif /* NETGRAPH */
 #if defined(SOL_ON)
-	if (Oflag) sol_array_end(&sol_stream);
+	if (sol_format) sol_array_end(&sol_stream);
 #endif
 	if ((af == AF_UNIX || af == AF_UNSPEC) && !sflag)
 		unixpr(nl[N_UNP_COUNT].n_value, nl[N_UNP_GENCNT].n_value,
 		    nl[N_UNP_DHEAD].n_value, nl[N_UNP_SHEAD].n_value,
 		    nl[N_UNP_SPHEAD].n_value);
 #if defined(SOL_ON)
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_end(&sol_stream);
 		sol_term(&sol_stream);
 	}

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/mbuf.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/mbuf.c	Sun Jun 22 11:32:23 2014	(r269848)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/mbuf.c	Sun Jun 22 12:02:57 2014	(r269849)
@@ -101,7 +101,7 @@
 	}
 
 #if defined(SOL_ON)
-	if (Oflag) sol_map_start(&sol_stream);
+	if (sol_format) sol_map_start(&sol_stream);
 #endif
 
 	/*
@@ -212,7 +212,7 @@
 	jumbo16_size = memstat_get_size(mtp);
 
 #if defined(SOL_ON)
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, "mbufs", 5);
 		sol_map_start(&sol_stream);
 
@@ -232,7 +232,7 @@
 			mbuf_count + packet_count + mbuf_free + packet_free);
 
 #if defined(SOL_ON)
-	if (Oflag) {
+	if (sol_format) {
 		sol_map_key(&sol_stream, "mbuf clusters", sizeof("mbuf clusters") - 1);
 		sol_map_start(&sol_stream);
 
@@ -255,7 +255,7 @@
 			cluster_count + cluster_free, cluster_limit);
 
 #if defined(SOL_ON)
-	if (Oflag) {
+	if (sol_format) {
 		SOL_MAP_KEYL(&sol_stream, "mbuf+clusters");
 		sol_map_start(&sol_stream);
 
@@ -273,7 +273,7 @@
 			packet_count, packet_free);
 
 #if defined(SOL_ON)
-	if (Oflag) {
+	if (sol_format) {
 		SOL_MAP_KEYL(&sol_stream, "jumbo clusters");
 		sol_map_start(&sol_stream);
 
@@ -298,7 +298,7 @@
 			jumbop_limit, jumbop_size / 1024);
 
 #if defined(SOL_ON)
-	if (Oflag) {
+	if (sol_format) {
 		SOL_MAP_KEYL(&sol_stream, "jumbo clusters 9k");
 		sol_map_start(&sol_stream);
 
@@ -321,7 +321,7 @@
 			jumbo9_limit);
 
 #if defined(SOL_ON)
-	if (Oflag) {
+	if (sol_format) {
 		SOL_MAP_KEYL(&sol_stream, "jumbo clusters 16k");
 		sol_map_start(&sol_stream);
 
@@ -393,7 +393,7 @@
 	bytes_total = bytes_inuse + bytes_incache;
 
 #if defined(SOL_ON)
-	if (Oflag) {
+	if (sol_format) {
 		SOL_MAP_KEYL(&sol_stream, "network");
 		sol_map_start(&sol_stream);
 
@@ -413,7 +413,7 @@
 			bytes_incache / 1024, bytes_total / 1024);
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
 		SOL_MAP_KEYL(&sol_stream, "mbuf requests");
 		sol_map_start(&sol_stream);
@@ -452,7 +452,7 @@
 	}
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
 		char pagesize[STRBUF_SIZEOF(uintmax_t) + sizeof("k")];
 		size_t len = snprintf(pagesize, sizeof(pagesize), "%juk", jumbop_size / 1024);
@@ -502,7 +502,7 @@
 		    !sysctlbyname("kern.ipc.nsfbufspeak", &nsfbufspeak,
 		    &mlen, NULL, 0)) {
 #if defined(SOL_ON)
-			if (Oflag) {
+			if (sol_format) {
 				SOL_MAP_KEYL(&sol_stream, "sfbufs");
 				sol_map_start(&sol_stream);
 
@@ -530,7 +530,7 @@
 			goto out;
 	}
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
 		SOL_MAP_KEYL(&sol_stream, "sfbuf requests");
 		sol_map_start(&sol_stream);
@@ -557,7 +557,7 @@
 	}
 out:
 #if defined(SOL_ON)
-	if (Oflag) sol_map_end(&sol_stream);
+	if (sol_format) sol_map_end(&sol_stream);
 #endif
 	memstat_mtl_free(mtlp);
 }

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/mroute.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/mroute.c	Sun Jun 22 11:32:23 2014	(r269848)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/mroute.c	Sun Jun 22 12:02:57 2014	(r269849)
@@ -107,7 +107,7 @@
 	gettimeofday(&now, NULL);
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
 # define SECOND_USECONDS 1000000 /* number of microseconds in a second */
 # define TIMEVAL_SECONDS(tv) ((tv).tv_sec + (double)(tv).tv_usec / SECOND_USECONDS)
@@ -233,7 +233,7 @@
 	bw_banner_printed = 0;
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
 		const char *origin = routename(m->mfc_origin.s_addr);
 		const char *group = routename(m->mfc_mcastgrp.s_addr);
@@ -289,7 +289,7 @@
 		if (error)
 			break;
 #if defined(SOL_ON)
-		if (Oflag) {
+		if (sol_format) {
 			SOL_MAP_KEYL(&sol_stream, "bandwidth");
 			sol_array_start(&sol_stream);
 			print_bw_meter(&bw_meter, &bw_banner_printed);
@@ -355,7 +355,7 @@
 	}
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
 		SOL_MAP_KEYL(&sol_stream, "vifs IPv4");
 		sol_array_start(&sol_stream);
@@ -369,7 +369,7 @@
 		maxvif = vifi;
 
 #if defined(SOL_ON)
-		if (Oflag)
+		if (sol_format)
 		{
 			char *local = routename(v->v_lcl_addr.s_addr);
 			char *remote = routename(v->v_rmt_addr.s_addr);
@@ -415,7 +415,7 @@
 		}
 	}
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 		sol_array_end(&sol_stream);
 	else
 #endif
@@ -461,7 +461,7 @@
 		m = mfctable;
 		while (len >= sizeof(*m)) {
 #if defined(SOL_ON)
-			if (Oflag) {
+			if (sol_format) {
 				SOL_MAP_KEYL(&sol_stream, "mfc");
 				sol_array_start(&sol_stream);
 				print_mfc(m++, maxvif, &banner_printed);
@@ -501,7 +501,7 @@
 			LIST_FOREACH(m, &mfchashtbl[i], mfc_hash) {
 				kread((u_long)m, (char *)&mfc, sizeof(mfc));
 #if defined(SOL_ON)
-				if (Oflag) {
+				if (sol_format) {
 					SOL_MAP_KEYL(&sol_stream, "mfc");
 					sol_array_start(&sol_stream);
 					print_mfc(m, maxvif, &banner_printed);
@@ -517,7 +517,7 @@
 	}
 
 #if defined(SOL_ON)
-	if (!Oflag)
+	if (!sol_format)
 #endif
 	{
 		if (!banner_printed)
@@ -554,7 +554,7 @@
 		kread_counters(mstaddr, &mrtstat, len);
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
 		SOL_MAP_KEYL(&sol_stream, "IPv4 multicast forwarding");
 		sol_map_start(&sol_stream);

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/mroute6.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/mroute6.c	Sun Jun 22 11:32:23 2014	(r269848)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/mroute6.c	Sun Jun 22 12:02:57 2014	(r269849)
@@ -156,7 +156,7 @@
 	banner_printed = 0;
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
 		SOL_MAP_KEYL(&sol_stream, "mifs IPv6");
 		sol_array_start(&sol_stream);
@@ -175,7 +175,7 @@
 		maxmif = mifi;
 
 #if defined(SOL_ON)
-		if (Oflag)
+		if (sol_format)
 		{
 			sol_map_start(&sol_stream);
 
@@ -217,7 +217,7 @@
 		}
 	}
 #if defined(SOL_ON)
-	if (Oflag) {
+	if (sol_format) {
 		sol_array_end(&sol_stream);
 		SOL_MAP_KEYL(&sol_stream, "multicast fwd cache IPv6");
 		sol_array_start(&sol_stream);
@@ -245,7 +245,7 @@
 			kread((u_long)mfcp, (char *)&mfc, sizeof(mfc));
 
 #if defined(SOL_ON)
-			if (Oflag)
+			if (sol_format)
 			{
 				char *origin = routename6(&mfc.mf6c_origin);
 				char *group = routename6(&mfc.mf6c_mcastgrp);
@@ -314,7 +314,7 @@
 		}
 	}
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 		sol_array_end(&sol_stream);
 	else
 #endif
@@ -352,7 +352,7 @@
 		kread(mstaddr, (char *)&mrtstat, sizeof(mrtstat));
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
 		SOL_MAP_KEYL(&sol_stream, "IPv6 multicast forwarding");
 		sol_map_start(&sol_stream);

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/netisr.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/netisr.c	Sun Jun 22 11:32:23 2014	(r269848)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/netisr.c	Sun Jun 22 12:02:57 2014	(r269849)
@@ -474,7 +474,7 @@
 	flags[3] = 0;
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
 		sol_map_key(&sol_stream, snpp->snp_name, strlen(snpp->snp_name));
 		sol_map_start(&sol_stream);
@@ -521,7 +521,7 @@
 			continue;
 
 #if defined(SOL_ON)
-		if (Oflag)
+		if (sol_format)
 		{
 			const char *name = netisr_proto2name(snwp->snw_proto);
 
@@ -600,7 +600,7 @@
 	}
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
 		char *threads_bound = (bindthreads ? "enabled" : "disabled");
 

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/netstat.h
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/netstat.h	Sun Jun 22 11:32:23 2014	(r269848)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/netstat.h	Sun Jun 22 12:02:57 2014	(r269849)
@@ -44,7 +44,6 @@
 extern int	noutputs;	/* how much outputs before we exit */
 extern int	numeric_addr;	/* show addresses numerically */
 extern int	numeric_port;	/* show ports numerically */
-extern int	Oflag;			/* use JSON as output format */
 extern int	rflag;	/* show routing tables (or routing stats) */
 extern int	Rflag;	/* show flowid / RSS information */
 extern int	sflag;	/* show protocol statistics */
@@ -53,7 +52,10 @@
 extern int	xflag;	/* extended display, includes all socket buffer info */
 extern int	zflag;	/* zero stats */
 
+extern int	sol_format;		/* use libsol for output */
+#if defined(SOL_ON)
 extern struct sol_stream sol_stream;
+#endif
 
 extern int	interval; /* repeat interval for i/f stats */
 

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/route.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/route.c	Sun Jun 22 11:32:23 2014	(r269848)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/route.c	Sun Jun 22 12:02:57 2014	(r269849)
@@ -188,7 +188,7 @@
 		err(EX_OSERR, "clock_gettime() failed");
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
 		SOL_MAP_KEYL(&sol_stream, "fib");
 		sol_integer(&sol_stream, fibnum);
@@ -241,7 +241,7 @@
 	}
 
 #if defined(SOL_ON)
-	if (Oflag)
+	if (sol_format)
 	{
 		if (afname)
 			sol_map_key(&sol_stream, afname, strlen(afname));
@@ -288,7 +288,7 @@
 
 #if defined(SOL_ON)
 	/* No size initialization necessary for SOL output. */
-	if (Oflag) return;
+	if (sol_format) return;
 #endif
 
 	wid_dst = WID_DST_DEFAULT(ef);
@@ -391,7 +391,7 @@
 
 #if defined(SOL_ON)
 	/* No size initialization necessary for SOL output. */
-	if (Oflag) return;
+	if (sol_format) return;
 #endif
 
 	if (Aflag)
@@ -481,7 +481,7 @@
 			}
 		} else if (af == AF_UNSPEC || af == fam) {
 #if defined(SOL_ON)
-			if (fam && Oflag) sol_array_end(&sol_stream);
+			if (fam && sol_format) sol_array_end(&sol_stream);
 #endif
 			size_cols(fam, head.rnh_treetop);
 			pr_family(fam);
@@ -489,7 +489,7 @@
 			pr_rthdr(fam);
 			p_rtree_kvm(head.rnh_treetop);
 #if defined(SOL_ON)
-			if (Oflag) sol_array_start(&sol_stream);
+			if (sol_format) sol_array_start(&sol_stream);
 #endif
 		}

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-soc-all mailing list