svn commit: r304519 - stable/11/usr.bin/netstat

[Michael Tuexen]

Author: tuexen
Date: Sat Aug 20 07:44:41 2016
New Revision: 304519
URL: https://svnweb.freebsd.org/changeset/base/304519

Log:
  MFC r304292:
  Use names for SCTP and UDPLite when reporting the input histogram.
  
  MFC r304295:
  Fix the output for scope statistics.

Modified:
  stable/11/usr.bin/netstat/inet6.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/netstat/inet6.c
==============================================================================
--- stable/11/usr.bin/netstat/inet6.c	Sat Aug 20 02:21:45 2016	(r304518)
+++ stable/11/usr.bin/netstat/inet6.c	Sat Aug 20 07:44:41 2016	(r304519)
@@ -207,11 +207,11 @@ static	const char *ip6nh[] = {
 	"#129",
 	"#130",
 	"#131",
-	"#132",
+	"SCTP",
 	"#133",
 	"#134",
 	"#135",
-	"#136",
+	"UDPLite",
 	"#137",
 	"#138",
 	"#139",
@@ -488,8 +488,8 @@ ip6_stats(u_long off, const char *name, 
 			  "{N:/global%s}\n");\
 			break;\
 		default:\
-			xo_emit("\t\t{qke:name/%x}{:count/%ju} " \
-				"addresses scope=%x\n",\
+			xo_emit("\t\t{qke:name/%#x}{:count/%ju} " \
+				"{N:/addresses scope=%#x}\n",\
 				i, (uintmax_t)ip6stat.s, i);	   \
 		}\
 	} while (0);