try to lookup /etc/protocols for histogram

kame · Dec 14, 2000 · 49f31b2 · 49f31b2
1 parent d841413
commit 49f31b2
Showing 1 changed file with 87 additions and 245 deletions.
diff --git a/netbsd/usr.bin/netstat/inet6.c b/netbsd/usr.bin/netstat/inet6.c
@@ -355,262 +355,93 @@ udp6_stats(off, name)
 }
 
 static	char *ip6nh[] = {
-	"hop by hop",
+/*0*/	"hop by hop",
 	"ICMP",
 	"IGMP",
-	"#3",
+	NULL,
 	"IP",
-	"#5",
+/*5*/	NULL,
 	"TCP",
-	"#7",
-	"#8",
-	"#9",
-	"#10",
-	"#11",
-	"#12",
-	"#13",
-	"#14",
-	"#15",
-	"#16",
+	NULL,
+	NULL,
+	NULL,
+/*10*/	NULL, NULL, NULL, NULL, NULL,
+/*15*/	NULL,
+	NULL,
 	"UDP",
-	"#18",
-	"#19",	
-	"#20",
-	"#21",
+	NULL,
+	NULL,
+/*20*/	NULL,
+	NULL,
 	"IDP",
-	"#23",
-	"#24",
-	"#25",
-	"#26",
-	"#27",
-	"#28",
-	"TP",	
-	"#30",
-	"#31",
-	"#32",
-	"#33",
-	"#34",
-	"#35",
-	"#36",
-	"#37",
-	"#38",
-	"#39",	
-	"#40",
+	NULL,
+	NULL,
+/*25*/	NULL,
+	NULL,
+	NULL,
+	NULL,
+	"TP",
+/*30*/	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+/*40*/	NULL,
 	"IP6",
-	"#42",
+	NULL,
 	"routing",
 	"fragment",
-	"#45",
-	"#46",
-	"#47",
-	"#48",
-	"#49",	
-	"ESP",
+/*45*/	NULL, NULL, NULL, NULL, NULL,
+/*50*/	"ESP",
 	"AH",
-	"#52",
-	"#53",
-	"#54",
-	"#55",
-	"#56",
-	"#57",
+	NULL,
+	NULL,
+	NULL,
+/*55*/	NULL,
+	NULL,
+	NULL,
 	"ICMP6",
-	"no next header",	
-	"destination option",
-	"#61",
-	"#62",
-	"#63",
-	"#64",
-	"#65",
-	"#66",
-	"#67",
-	"#68",
-	"#69",	
-	"#70",
-	"#71",
-	"#72",
-	"#73",
-	"#74",
-	"#75",
-	"#76",
-	"#77",
-	"#78",
-	"#79",	
-	"ISOIP",
-	"#81",
-	"#82",
-	"#83",
-	"#84",
-	"#85",
-	"#86",
-	"#87",
-	"#88",
-	"OSPF",	
-	"#80",
-	"#91",
-	"#92",
-	"#93",
-	"#94",
-	"#95",
-	"#96",
+	"no next header",
+/*60*/	"destination option",
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+/*65*/	NULL, NULL, NULL, NULL, NULL,
+/*70*/	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+/*80*/	"ISOIP",
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	"OSPF",
+/*90*/	NULL, NULL, NULL, NULL, NULL,
+/*95*/	NULL,
+	NULL,
 	"Ethernet",
-	"#98",
-	"#99",	
-	"#100",
-	"#101",
-	"#102",
+	NULL,
+	NULL,
+/*100*/	NULL,
+	NULL,
+	NULL,
 	"PIM",
-	"#104",
-	"#105",
-	"#106",
-	"#107",
-	"#108",
-	"#109",	
-	"#110",
-	"#111",
-	"#112",
-	"#113",
-	"#114",
-	"#115",
-	"#116",
-	"#117",
-	"#118",
-	"#119",	
-	"#120",
-	"#121",
-	"#122",
-	"#123",
-	"#124",
-	"#125",
-	"#126",
-	"#127",
-	"#128",
-	"#129",	
-	"#130",
-	"#131",
-	"#132",
-	"#133",
-	"#134",
-	"#135",
-	"#136",
-	"#137",
-	"#138",
-	"#139",	
-	"#140",
-	"#141",
-	"#142",
-	"#143",
-	"#144",
-	"#145",
-	"#146",
-	"#147",
-	"#148",
-	"#149",	
-	"#150",
-	"#151",
-	"#152",
-	"#153",
-	"#154",
-	"#155",
-	"#156",
-	"#157",
-	"#158",
-	"#159",	
-	"#160",
-	"#161",
-	"#162",
-	"#163",
-	"#164",
-	"#165",
-	"#166",
-	"#167",
-	"#168",
-	"#169",	
-	"#170",
-	"#171",
-	"#172",
-	"#173",
-	"#174",
-	"#175",
-	"#176",
-	"#177",
-	"#178",
-	"#179",	
-	"#180",
-	"#181",
-	"#182",
-	"#183",
-	"#184",
-	"#185",
-	"#186",
-	"#187",
-	"#188",
-	"#189",	
-	"#180",
-	"#191",
-	"#192",
-	"#193",
-	"#194",
-	"#195",
-	"#196",
-	"#197",
-	"#198",
-	"#199",	
-	"#200",
-	"#201",
-	"#202",
-	"#203",
-	"#204",
-	"#205",
-	"#206",
-	"#207",
-	"#208",
-	"#209",	
-	"#210",
-	"#211",
-	"#212",
-	"#213",
-	"#214",
-	"#215",
-	"#216",
-	"#217",
-	"#218",
-	"#219",	
-	"#220",
-	"#221",
-	"#222",
-	"#223",
-	"#224",
-	"#225",
-	"#226",
-	"#227",
-	"#228",
-	"#229",	
-	"#230",
-	"#231",
-	"#232",
-	"#233",
-	"#234",
-	"#235",
-	"#236",
-	"#237",
-	"#238",
-	"#239",	
-	"#240",
-	"#241",
-	"#242",
-	"#243",
-	"#244",
-	"#245",
-	"#246",
-	"#247",
-	"#248",
-	"#249",	
-	"#250",
-	"#251",
-	"#252",
-	"#253",
-	"#254",
-	"#255",
+	NULL,
+/*105*/	NULL, NULL, NULL, NULL, NULL,
+/*110*/	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+/*120*/	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+/*140*/	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+/*160*/	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+/*180*/	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+/*200*/	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+/*220*/	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+/*240*/	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL,
 };
 
 /*
@@ -623,6 +454,8 @@ ip6_stats(off, name)
 {
 	struct ip6stat ip6stat;
 	int first, i;
+	struct protoent *ep;
+	const char *n;
 
 	if (off == 0)
 		return;
@@ -666,8 +499,17 @@ ip6_stats(off, name)
 				printf("\tInput histogram:\n");
 				first = 0;
 			}
-			printf("\t\t%s: %llu\n", ip6nh[i],
-			       (unsigned long long)ip6stat.ip6s_nxthist[i]);
+			n = NULL;
+			if (ip6nh[i])
+				n = ip6nh[i];
+			else if ((ep = getprotobynumber(i)) != NULL)
+				n = ep->p_name;
+			if (n)
+				printf("\t\t%s: %llu\n", n,
+				    (unsigned long long)ip6stat.ip6s_nxthist[i]);
+			else
+				printf("\t\t#%d: %llu\n", i,
+				    (unsigned long long)ip6stat.ip6s_nxthist[i]);
 		}
 	printf("\tMbuf statistics:\n");
 	p(ip6s_m1, "\t\t%llu one mbuf%s\n");