sync with latest kame netstat. basically, more statistics

1 files changed, 42 insertions, 28 deletions

diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
index 3730a9e..f605a03 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -139,7 +139,8 @@ mroute6pr(mfcaddr, mifaddr)
 		printf("   %5s", (mifp->m6_flags & MIFF_REGISTER) ?
 		       "reg0" : if_indextoname(ifnet.if_index, ifname));
 
-		printf(" %9qu  %9qu\n", mifp->m6_pkt_in, mifp->m6_pkt_out);
+		printf(" %9llu  %9llu\n", (unsigned long long)mifp->m6_pkt_in,
+		    (unsigned long long)mifp->m6_pkt_out);
 	}
 	if (!banner_printed)
 		printf("\nIPv6 Multicast Interface Table is empty\n");
@@ -163,7 +164,7 @@ mroute6pr(mfcaddr, mifaddr)
 			       routename6(&mfc.mf6c_origin));
 			printf(" %-*.*s", WID_GRP, WID_GRP,
 			       routename6(&mfc.mf6c_mcastgrp));
-			printf(" %9qu", mfc.mf6c_pkt_cnt);
+			printf(" %9llu", (unsigned long long)mfc.mf6c_pkt_cnt);
 
 			for (waitings = 0, rtep = mfc.mf6c_stall; rtep; ) {
 				waitings++;
@@ -206,30 +207,43 @@ mrt6_stats(mstaddr)
 
 	kread(mstaddr, (char *)&mrtstat, sizeof(mrtstat));
 	printf("IPv6 multicast forwarding:\n");
-	printf(" %10qu multicast forwarding cache lookup%s\n",
-	       mrtstat.mrt6s_mfc_lookups, plural(mrtstat.mrt6s_mfc_lookups));
-	printf(" %10qu multicast forwarding cache miss%s\n",
-	       mrtstat.mrt6s_mfc_misses, plurales(mrtstat.mrt6s_mfc_misses));
-	printf(" %10qu upcall%s to mrouted\n",
-	       mrtstat.mrt6s_upcalls, plural(mrtstat.mrt6s_upcalls));
-	printf(" %10qu upcall queue overflow%s\n",
-	  mrtstat.mrt6s_upq_ovflw, plural(mrtstat.mrt6s_upq_ovflw));
-	printf(" %10qu upcall%s dropped due to full socket buffer\n",
-	  mrtstat.mrt6s_upq_sockfull, plural(mrtstat.mrt6s_upq_sockfull));
-	printf(" %10qu cache cleanup%s\n",
-	  mrtstat.mrt6s_cache_cleanups, plural(mrtstat.mrt6s_cache_cleanups));
-	printf(" %10qu datagram%s with no route for origin\n",
-	  mrtstat.mrt6s_no_route, plural(mrtstat.mrt6s_no_route));
-	printf(" %10qu datagram%s arrived with bad tunneling\n",
-	  mrtstat.mrt6s_bad_tunnel, plural(mrtstat.mrt6s_bad_tunnel));
-	printf(" %10qu datagram%s could not be tunneled\n",
-	  mrtstat.mrt6s_cant_tunnel, plural(mrtstat.mrt6s_cant_tunnel));
-	printf(" %10qu datagram%s arrived on wrong interface\n",
-	  mrtstat.mrt6s_wrong_if, plural(mrtstat.mrt6s_wrong_if));
-	printf(" %10qu datagram%s selectively dropped\n",
-	  mrtstat.mrt6s_drop_sel, plural(mrtstat.mrt6s_drop_sel));
-	printf(" %10qu datagram%s dropped due to queue overflow\n",
-	  mrtstat.mrt6s_q_overflow, plural(mrtstat.mrt6s_q_overflow));
-	printf(" %10qu datagram%s dropped for being too large\n",
-	  mrtstat.mrt6s_pkt2large, plural(mrtstat.mrt6s_pkt2large));
+	printf(" %10llu multicast forwarding cache lookup%s\n",
+	    (unsigned long long)mrtstat.mrt6s_mfc_lookups,
+	    plural(mrtstat.mrt6s_mfc_lookups));
+	printf(" %10llu multicast forwarding cache miss%s\n",
+	    (unsigned long long)mrtstat.mrt6s_mfc_misses,
+	    plurales(mrtstat.mrt6s_mfc_misses));
+	printf(" %10llu upcall%s to mrouted\n",
+	    (unsigned long long)mrtstat.mrt6s_upcalls,
+	    plural(mrtstat.mrt6s_upcalls));
+	printf(" %10llu upcall llueue overflow%s\n",
+	    (unsigned long long)mrtstat.mrt6s_upq_ovflw,
+	    plural(mrtstat.mrt6s_upq_ovflw));
+	printf(" %10llu upcall%s dropped due to full socket buffer\n",
+	    (unsigned long long)mrtstat.mrt6s_upq_sockfull,
+	    plural(mrtstat.mrt6s_upq_sockfull));
+	printf(" %10llu cache cleanup%s\n",
+	    (unsigned long long)mrtstat.mrt6s_cache_cleanups,
+	    plural(mrtstat.mrt6s_cache_cleanups));
+	printf(" %10llu datagram%s with no route for origin\n",
+	    (unsigned long long)mrtstat.mrt6s_no_route,
+	    plural(mrtstat.mrt6s_no_route));
+	printf(" %10llu datagram%s arrived with bad tunneling\n",
+	    (unsigned long long)mrtstat.mrt6s_bad_tunnel,
+	    plural(mrtstat.mrt6s_bad_tunnel));
+	printf(" %10llu datagram%s could not be tunneled\n",
+	    (unsigned long long)mrtstat.mrt6s_cant_tunnel,
+	    plural(mrtstat.mrt6s_cant_tunnel));
+	printf(" %10llu datagram%s arrived on wrong interface\n",
+	    (unsigned long long)mrtstat.mrt6s_wrong_if,
+	    plural(mrtstat.mrt6s_wrong_if));
+	printf(" %10llu datagram%s selectively dropped\n",
+	    (unsigned long long)mrtstat.mrt6s_drop_sel,
+	    plural(mrtstat.mrt6s_drop_sel));
+	printf(" %10llu datagram%s dropped due to llueue overflow\n",
+	    (unsigned long long)mrtstat.mrt6s_q_overflow,
+	    plural(mrtstat.mrt6s_q_overflow));
+	printf(" %10llu datagram%s dropped for being too large\n",
+	    (unsigned long long)mrtstat.mrt6s_pkt2large,
+	    plural(mrtstat.mrt6s_pkt2large));
 }