Merge ^/head r279023 through r279162.

1 files changed, 210 insertions, 109 deletions

diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index a4c86be..002567b 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <sysexits.h>
 #include <unistd.h>
+#include <libxo/xo.h>
 
 #include "netstat.h"
 
@@ -98,14 +99,38 @@ static const char* pfsyncacts[] = {
 	/* PFSYNC_ACT_EOF */		"end of frame mark",
 };
 
+static const char* pfsyncacts_name[] = {
+	/* PFSYNC_ACT_CLR */		"clear-all-request",
+	/* PFSYNC_ACT_INS */		"state-insert",
+	/* PFSYNC_ACT_INS_ACK */	"state-inserted-ack",
+	/* PFSYNC_ACT_UPD */		"state-update",
+	/* PFSYNC_ACT_UPD_C */		"compressed-state-update",
+	/* PFSYNC_ACT_UPD_REQ */	"uncompressed-state-request",
+	/* PFSYNC_ACT_DEL */		"state-delete",
+	/* PFSYNC_ACT_DEL_C */		"compressed-state-delete",
+	/* PFSYNC_ACT_INS_F */		"fragment-insert",
+	/* PFSYNC_ACT_DEL_F */		"fragment-delete",
+	/* PFSYNC_ACT_BUS */		"bulk-update-mark",
+	/* PFSYNC_ACT_TDB */		"TDB-replay-counter-update",
+	/* PFSYNC_ACT_EOF */		"end-of-frame-mark",
+};
+
 static void
-pfsync_acts_stats(const char *fmt, uint64_t *a)
+pfsync_acts_stats(const char *list, const char *desc, uint64_t *a)
 {
 	int i;
 
-	for (i = 0; i < PFSYNC_ACT_MAX; i++, a++)
-		if (*a || sflag <= 1)
-			printf(fmt, *a, pfsyncacts[i], plural(*a));
+	xo_open_list(list);
+	for (i = 0; i < PFSYNC_ACT_MAX; i++, a++) {
+		if (*a || sflag <= 1) {
+			xo_open_instance(list);
+			xo_emit("\t\t{e:name}{:count/%ju} {N:/%s%s %s}\n",
+			    pfsyncacts_name[i], (uintmax_t)(*a),
+			    pfsyncacts[i], plural(*a), desc);
+			xo_close_instance(list);
+		}
+	}
+	xo_close_list(list);
 }
 
 /*
@@ -129,32 +154,50 @@ pfsync_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 	} else
 		kread(off, &pfsyncstat, len);
 
-	printf("%s:\n", name);
+	xo_emit("{T:/%s}:\n", name);
+	xo_open_container(name);
 
 #define	p(f, m) if (pfsyncstat.f || sflag <= 1) \
-	printf(m, (uintmax_t)pfsyncstat.f, plural(pfsyncstat.f))
+	xo_emit(m, (uintmax_t)pfsyncstat.f, plural(pfsyncstat.f))
 
-	p(pfsyncs_ipackets, "\t%ju packet%s received (IPv4)\n");
-	p(pfsyncs_ipackets6, "\t%ju packet%s received (IPv6)\n");
-	pfsync_acts_stats("\t    %ju %s%s received\n",
+	p(pfsyncs_ipackets, "\t{:received-inet-packets/%ju} "
+	    "{N:/packet%s received (IPv4)}\n");
+	p(pfsyncs_ipackets6, "\t{:received-inet6-packets/%ju} "
+	    "{N:/packet%s received (IPv6)}\n");
+	pfsync_acts_stats("input-histogram", "received",
 	    &pfsyncstat.pfsyncs_iacts[0]);
-	p(pfsyncs_badif, "\t\t%ju packet%s discarded for bad interface\n");
-	p(pfsyncs_badttl, "\t\t%ju packet%s discarded for bad ttl\n");
-	p(pfsyncs_hdrops, "\t\t%ju packet%s shorter than header\n");
-	p(pfsyncs_badver, "\t\t%ju packet%s discarded for bad version\n");
-	p(pfsyncs_badauth, "\t\t%ju packet%s discarded for bad HMAC\n");
-	p(pfsyncs_badact,"\t\t%ju packet%s discarded for bad action\n");
-	p(pfsyncs_badlen, "\t\t%ju packet%s discarded for short packet\n");
-	p(pfsyncs_badval, "\t\t%ju state%s discarded for bad values\n");
-	p(pfsyncs_stale, "\t\t%ju stale state%s\n");
-	p(pfsyncs_badstate, "\t\t%ju failed state lookup/insert%s\n");
-	p(pfsyncs_opackets, "\t%ju packet%s sent (IPv4)\n");
-	p(pfsyncs_opackets6, "\t%ju packet%s sent (IPv6)\n");
-	pfsync_acts_stats("\t    %ju %s%s sent\n",
+	p(pfsyncs_badif, "\t\t/{:dropped-bad-interface/%ju} "
+	    "{N:/packet%s discarded for bad interface}\n");
+	p(pfsyncs_badttl, "\t\t{:dropped-bad-ttl/%ju} "
+	    "{N:/packet%s discarded for bad ttl}\n");
+	p(pfsyncs_hdrops, "\t\t{:dropped-short-header/%ju} "
+	    "{N:/packet%s shorter than header}\n");
+	p(pfsyncs_badver, "\t\t{:dropped-bad-version/%ju} "
+	    "{N:/packet%s discarded for bad version}\n");
+	p(pfsyncs_badauth, "\t\t{:dropped-bad-auth/%ju} "
+	    "{N:/packet%s discarded for bad HMAC}\n");
+	p(pfsyncs_badact,"\t\t{:dropped-bad-action/%ju} "
+	    "{N:/packet%s discarded for bad action}\n");
+	p(pfsyncs_badlen, "\t\t{:dropped-short/%ju} "
+	    "{N:/packet%s discarded for short packet}\n");
+	p(pfsyncs_badval, "\t\t{:dropped-bad-values/%ju} "
+	    "{N:/state%s discarded for bad values}\n");
+	p(pfsyncs_stale, "\t\t{:dropped-stale-state/%ju} "
+	    "{N:/stale state%s}\n");
+	p(pfsyncs_badstate, "\t\t{:dropped-failed-lookup/%ju} "
+	    "{N:/failed state lookup\\/insert%s}\n");
+	p(pfsyncs_opackets, "\t{:sent-inet-packets/%ju} "
+	    "{N:/packet%s sent (IPv4})\n");
+	p(pfsyncs_opackets6, "\t{:send-inet6-packets/%ju} "
+	    "{N:/packet%s sent (IPv6})\n");
+	pfsync_acts_stats("output-histogram", "sent",
 	    &pfsyncstat.pfsyncs_oacts[0]);
-	p(pfsyncs_onomem, "\t\t%ju failure%s due to mbuf memory error\n");
-	p(pfsyncs_oerrors, "\t\t%ju send error%s\n");
+	p(pfsyncs_onomem, "\t\t{:discarded-no-memory/%ju} "
+	    "{N:/failure%s due to mbuf memory error}\n");
+	p(pfsyncs_oerrors, "\t\t{:send-errors/%ju} "
+	    "{N:/send error%s}\n");
 #undef p
+	xo_close_container(name);
 }
 #endif /* PF */
 
@@ -162,10 +205,11 @@ pfsync_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
  * Display a formatted value, or a '-' in the same space.
  */
 static void
-show_stat(const char *fmt, int width, u_long value, short showvalue)
+show_stat(const char *fmt, int width, const char *name,
+    u_long value, short showvalue)
 {
 	const char *lsep, *rsep;
-	char newfmt[32];
+	char newfmt[64];
 
 	lsep = "";
 	if (strncmp(fmt, "LS", 2) == 0) {
@@ -179,23 +223,42 @@ show_stat(const char *fmt, int width, u_long value, short showvalue)
 	}
 	if (showvalue == 0) {
 		/* Print just dash. */
-		sprintf(newfmt, "%s%%%ds%s", lsep, width, rsep);
-		printf(newfmt, "-");
+		xo_emit("{P:/%s}{D:/%*s}{P:/%s}", lsep, width, "-", rsep);
 		return;
 	}
 
+	/*
+	 * XXX: workaround {P:} modifier can't be empty and doesn't seem to
+	 * take args... so we need to conditionally include it in the format.
+	 */
+#define maybe_pad(pad)	do {						    \
+	if (strlen(pad)) {						    \
+		snprintf(newfmt, sizeof(newfmt), "{P:%s}", pad);	    \
+		xo_emit(newfmt);					    \
+	}								    \
+} while (0)
+
 	if (hflag) {
 		char buf[5];
 
 		/* Format in human readable form. */
 		humanize_number(buf, sizeof(buf), (int64_t)value, "",
 		    HN_AUTOSCALE, HN_NOSPACE | HN_DECIMAL);
-		sprintf(newfmt, "%s%%%ds%s", lsep, width, rsep);
-		printf(newfmt, buf);
+		snprintf(newfmt, sizeof(newfmt), "%s%%%ds%s",
+		    lsep, width, rsep);
+		xo_emit(newfmt, buf);
+		xo_attr("value", "%lu", value);
+		maybe_pad(lsep);
+		snprintf(newfmt, sizeof(newfmt), "{:%s/%%%ds}", name, width);
+		xo_emit(newfmt, buf);
+		maybe_pad(rsep);
 	} else {
 		/* Construct the format string. */
-		sprintf(newfmt, "%s%%%d%s%s", lsep, width, fmt, rsep);
-		printf(newfmt, value);
+		maybe_pad(lsep);
+		snprintf(newfmt, sizeof(newfmt), "{:%s/%%%d%s}",
+		    name, width, fmt);
+		xo_emit(newfmt, value);
+		maybe_pad(rsep);
 	}
 }
 
@@ -235,34 +298,37 @@ intpr(int interval, void (*pfunc)(char *), int af)
 	if (aflag && getifmaddrs(&ifmap) != 0)
 		err(EX_OSERR, "getifmaddrs");
 
+	xo_open_list("interface");
 	if (!pfunc) {
 		if (Wflag)
-			printf("%-7.7s", "Name");
+			xo_emit("{T:/%-7.7s}", "Name");
 		else
-			printf("%-5.5s", "Name");
-		printf(" %5.5s %-13.13s %-17.17s %8.8s %5.5s %5.5s",
+			xo_emit("{T:/%-5.5s}", "Name");
+		xo_emit(" {T:/%5.5s} {T:/%-13.13s} {T:/%-17.17s} {T:/%8.8s} "
+		    "{T:/%5.5s} {T:/%5.5s}",
 		    "Mtu", "Network", "Address", "Ipkts", "Ierrs", "Idrop");
 		if (bflag)
-			printf(" %10.10s","Ibytes");
-		printf(" %8.8s %5.5s", "Opkts", "Oerrs");
+			xo_emit(" {T:/%10.10s}","Ibytes");
+		xo_emit(" {T:/%8.8s} {T:/%5.5s}", "Opkts", "Oerrs");
 		if (bflag)
-			printf(" %10.10s","Obytes");
-		printf(" %5s", "Coll");
+			xo_emit(" {T:/%10.10s}","Obytes");
+		xo_emit(" {T:/%5s}", "Coll");
 		if (dflag)
-			printf("  %s", "Drop");
-		putchar('\n');
+			xo_emit(" {T:/%s}", "Drop");
+		xo_emit("\n");
 	}
 
 	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
 		bool network = false, link = false;
+		char *name;
 
 		if (interface != NULL && strcmp(ifa->ifa_name, interface) != 0)
 			continue;
 
+		name = ifa->ifa_name;
+
 		if (pfunc) {
-			char *name;
 
-			name = ifa->ifa_name;
 			(*pfunc)(name);
 
 			/*
@@ -278,19 +344,21 @@ intpr(int interval, void (*pfunc)(char *), int af)
 		if (af != AF_UNSPEC && ifa->ifa_addr->sa_family != af)
 			continue;
 
+		xo_open_instance("interface");
+
 		if (Wflag)
-			printf("%-7.7s", ifa->ifa_name);
+			xo_emit("{tk:name/%-7.7s}", name);
 		else
-			printf("%-5.5s", ifa->ifa_name);
+			xo_emit("{tk:name/%-5.5s}", name);
 
 #define IFA_MTU(ifa)	(((struct if_data *)(ifa)->ifa_data)->ifi_mtu)
-		show_stat("lu", 6, IFA_MTU(ifa), IFA_MTU(ifa));
+		show_stat("lu", 6, "mtu", IFA_MTU(ifa), IFA_MTU(ifa));
 #undef IFA_MTU
 
 		switch (ifa->ifa_addr->sa_family) {
 		case AF_UNSPEC:
-			printf("%-13.13s ", "none");
-			printf("%-15.15s ", "none");
+			xo_emit("{:network/%-13.13s} ", "none");
+			xo_emit("{:address/%-15.15s} ", "none");
 			break;
 		case AF_INET:
 		    {
@@ -298,9 +366,10 @@ intpr(int interval, void (*pfunc)(char *), int af)
 
 			sin = (struct sockaddr_in *)ifa->ifa_addr;
 			mask = (struct sockaddr_in *)ifa->ifa_netmask;
-			printf("%-13.13s ", netname(sin->sin_addr.s_addr,
+			xo_emit("{t:network/%-13.13s} ",
+			    netname(sin->sin_addr.s_addr,
 			    mask->sin_addr.s_addr));
-			printf("%-17.17s ",
+			xo_emit("{t:address/%-17.17s} ",
 			    routename(sin->sin_addr.s_addr));
 
 			network = true;
@@ -314,67 +383,82 @@ intpr(int interval, void (*pfunc)(char *), int af)
 			sin6 = (struct sockaddr_in6 *)ifa->ifa_addr;
 			mask = (struct sockaddr_in6 *)ifa->ifa_netmask;
 
-			printf("%-13.13s ", netname6(sin6, &mask->sin6_addr));
+			xo_emit("{t:network/%-13.13s} ",
+			    netname6(sin6, &mask->sin6_addr));
 			getnameinfo(ifa->ifa_addr, ifa->ifa_addr->sa_len,
 			    addr_buf, sizeof(addr_buf), 0, 0, NI_NUMERICHOST);
-			printf("%-17.17s ", addr_buf);
+			xo_emit("{t:address/%-17.17s} ", addr_buf);
 
 			network = 1;
 			break;
-	            }
+		    }
 #endif /* INET6 */
 		case AF_LINK:
 		    {
 			struct sockaddr_dl *sdl;
 			char *cp, linknum[10];
-			int n, m;
+			int len = 32;
+			char buf[len];
+			int n, z;
 
 			sdl = (struct sockaddr_dl *)ifa->ifa_addr;
 			cp = (char *)LLADDR(sdl);
 			n = sdl->sdl_alen;
 			sprintf(linknum, "<Link#%d>", sdl->sdl_index);
-			m = printf("%-13.13s ", linknum);
-
-			while ((--n >= 0) && (m < 30))
-				m += printf("%02x%c", *cp++ & 0xff,
-					    n > 0 ? ':' : ' ');
-			m = 32 - m;
-			while (m-- > 0)
-				putchar(' ');
-
+			xo_emit("{t:network/%-13.13s} ", linknum);
+			buf[0] = '\0';
+			z = 0;
+			while ((--n >= 0) && (z < len)) {
+				snprintf(buf + z, len - z, "%02x%c",
+				    *cp++ & 0xff, n > 0 ? ':' : ' ');
+				z += 3;
+			}
+			if (z > 0)
+				xo_emit("{:address/%*s}", 32 - z, buf);
+			else
+				xo_emit("{P:                  }");
 			link = 1;
 			break;
 		    }
 		}
 
 #define	IFA_STAT(s)	(((struct if_data *)ifa->ifa_data)->ifi_ ## s)
-		show_stat("lu", 8, IFA_STAT(ipackets), link|network);
-		show_stat("lu", 5, IFA_STAT(ierrors), link);
-		show_stat("lu", 5, IFA_STAT(iqdrops), link);
+		show_stat("lu", 8, "received-packets", IFA_STAT(ipackets),
+		    link|network);
+		show_stat("lu", 5, "received-errors", IFA_STAT(ierrors), link);
+		show_stat("lu", 5, "dropped-packet", IFA_STAT(iqdrops), link);
 		if (bflag)
-			show_stat("lu", 10, IFA_STAT(ibytes), link|network);
-		show_stat("lu", 8, IFA_STAT(opackets), link|network);
-		show_stat("lu", 5, IFA_STAT(oerrors), link);
+			show_stat("lu", 10, "received-bytes", IFA_STAT(ibytes),
+			    link|network);
+		show_stat("lu", 8, "sent-packets", IFA_STAT(opackets),
+		    link|network);
+		show_stat("lu", 5, "send-errors", IFA_STAT(oerrors), link);
 		if (bflag)
-			show_stat("lu", 10, IFA_STAT(obytes), link|network);
-		show_stat("NRSlu", 5, IFA_STAT(collisions), link);
+			show_stat("lu", 10, "sent-bytes", IFA_STAT(obytes),
+			    link|network);
+		show_stat("NRSlu", 5, "collisions", IFA_STAT(collisions), link);
 		if (dflag)
-			show_stat("LSlu", 5, IFA_STAT(oqdrops), link);
-		putchar('\n');
+			show_stat("LSlu", 5, "dropped-packets",
+			    IFA_STAT(oqdrops), link);
+		xo_emit("\n");
 
-		if (!aflag)
+		if (!aflag) {
+			xo_close_instance("interface");
 			continue;
+		}
 
 		/*
 		 * Print family's multicast addresses.
 		 */
+		xo_open_list("multicast-address");
 		for (ifma = next_ifma(ifmap, ifa->ifa_name,
-		     ifa->ifa_addr->sa_family);
-		     ifma != NULL;
-		     ifma = next_ifma(ifma, ifa->ifa_name,
-		     ifa->ifa_addr->sa_family)) {
+		    ifa->ifa_addr->sa_family);
+		    ifma != NULL;
+		    ifma = next_ifma(ifma, ifa->ifa_name,
+		    ifa->ifa_addr->sa_family)) {
 			const char *fmt = NULL;
 
+			xo_open_instance("multicast-address");
 			switch (ifma->ifma_addr->sa_family) {
 			case AF_INET:
 			    {
@@ -391,7 +475,7 @@ intpr(int interval, void (*pfunc)(char *), int af)
 				getnameinfo(ifma->ifma_addr,
 				    ifma->ifma_addr->sa_len, addr_buf,
 				    sizeof(addr_buf), 0, 0, NI_NUMERICHOST);
-				printf("%*s %s\n",
+				xo_emit("{P:/%*s }{t:address/%-19.19s}",
 				    Wflag ? 27 : 25, "", addr_buf);
 				break;
 #endif /* INET6 */
@@ -412,21 +496,24 @@ intpr(int interval, void (*pfunc)(char *), int af)
 			}
 
 			if (fmt) {
-				printf("%*s %-17.17s",
+				xo_emit("{P:/%*s }{t:address/%-17.17s/}",
 				    Wflag ? 27 : 25, "", fmt);
 				if (ifma->ifma_addr->sa_family == AF_LINK) {
-					printf(" %8ju",
-					    (uintmax_t )IFA_STAT(imcasts));
-					printf("%*s", bflag ? 17 : 6, "");
-					printf(" %8ju",
-					    (uintmax_t )IFA_STAT(omcasts));
-				}
-				putchar('\n');
+					xo_emit(" {:received-packets/%8lu}",
+					    IFA_STAT(imcasts));
+					xo_emit("{P:/%*s}", bflag? 17 : 6, "");
+					xo_emit(" {:sent-packets/%8lu}",
+					    IFA_STAT(omcasts));
+ 				}
+				xo_emit("\n");
 			}
-
+			xo_close_instance("multicast-address");
 			ifma = ifma->ifma_next;
 		}
+		xo_close_list("multicast-address");
+		xo_close_instance("interface");
 	}
+	xo_close_list("interface");
 
 	freeifaddrs(ifap);
 	if (aflag)
@@ -455,7 +542,7 @@ fill_iftot(struct iftot *st)
 	bool found = false;
 
 	if (getifaddrs(&ifap) != 0)
-		err(EX_OSERR, "getifaddrs");
+		xo_err(EX_OSERR, "getifaddrs");
 
 	bzero(st, sizeof(*st));
 
@@ -481,7 +568,7 @@ fill_iftot(struct iftot *st)
 	}
 
 	if (interface && found == false)
-		err(EX_DATAERR, "interface %s not found", interface);
+		xo_err(EX_DATAERR, "interface %s not found", interface);
 
 	freeifaddrs(ifap);
 }
@@ -520,23 +607,26 @@ sidewaysintpr(int interval)
 	interval_it.it_interval.tv_usec = 0;
 	interval_it.it_value = interval_it.it_interval;
 	setitimer(ITIMER_REAL, &interval_it, NULL);
+	xo_open_list("interface-statistics");
 
 banner:
-	printf("%17s %14s %16s", "input",
+	xo_emit("{T:/%17s} {T:/%14s} {T:/%16s}\n", "input",
 	    interface != NULL ? interface : "(Total)", "output");
-	putchar('\n');
-	printf("%10s %5s %5s %10s %10s %5s %10s %5s",
+	xo_emit("{T:/%10s} {T:/%5s} {T:/%5s} {T:/%10s} {T:/%10s} {T:/%5s} "
+	    "{T:/%10s} {T:/%5s}",
 	    "packets", "errs", "idrops", "bytes", "packets", "errs", "bytes",
 	    "colls");
 	if (dflag)
-		printf(" %5.5s", "drops");
-	putchar('\n');
-	fflush(stdout);
+		xo_emit(" {T:/%5.5s}", "drops");
+	xo_emit("\n");
+	xo_flush();
 	line = 0;
 
 loop:
-	if ((noutputs != 0) && (--noutputs == 0))
-		exit(0);
+	if ((noutputs != 0) && (--noutputs == 0)) {
+		xo_close_list("interface-statistics");
+		return;
+	}
 	oldmask = sigblock(sigmask(SIGALRM));
 	while (!signalled)
 		sigpause(0);
@@ -546,18 +636,29 @@ loop:
 
 	fill_iftot(new);
 
-	show_stat("lu", 10, new->ift_ip - old->ift_ip, 1);
-	show_stat("lu", 5, new->ift_ie - old->ift_ie, 1);
-	show_stat("lu", 5, new->ift_id - old->ift_id, 1);
-	show_stat("lu", 10, new->ift_ib - old->ift_ib, 1);
-	show_stat("lu", 10, new->ift_op - old->ift_op, 1);
-	show_stat("lu", 5, new->ift_oe - old->ift_oe, 1);
-	show_stat("lu", 10, new->ift_ob - old->ift_ob, 1);
-	show_stat("NRSlu", 5, new->ift_co - old->ift_co, 1);
+	xo_open_instance("stats");
+	show_stat("lu", 10, "received-packets",
+	    new->ift_ip - old->ift_ip, 1);
+	show_stat("lu", 5, "received-errors",
+	    new->ift_ie - old->ift_ie, 1);
+	show_stat("lu", 5, "dropped-packets",
+	    new->ift_id - old->ift_id, 1);
+	show_stat("lu", 10, "received-bytes",
+	    new->ift_ib - old->ift_ib, 1);
+	show_stat("lu", 10, "sent-packets",
+	    new->ift_op - old->ift_op, 1);
+	show_stat("lu", 5, "send-errors",
+	    new->ift_oe - old->ift_oe, 1);
+	show_stat("lu", 10, "sent-bytes",
+	    new->ift_ob - old->ift_ob, 1);
+	show_stat("NRSlu", 5, "collisions",
+	    new->ift_co - old->ift_co, 1);
 	if (dflag)
-		show_stat("LSlu", 5, new->ift_od - old->ift_od, 1);
-	putchar('\n');
-	fflush(stdout);
+		show_stat("LSlu", 5, "dropped-packets",
+		    new->ift_od - old->ift_od, 1);
+	xo_close_instance("stats");
+	xo_emit("\n");
+	xo_flush();
 
 	if (new == &ift[0]) {
 		new = &ift[1];