5 files changed, 237 insertions, 10 deletions

diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
index c1f75394317b..f52e79269815 100644
--- a/usr.bin/netstat/Makefile
+++ b/usr.bin/netstat/Makefile
@@ -3,7 +3,7 @@
 
 PROG=	netstat
 SRCS=	if.c inet.c inet6.c main.c mbuf.c mroute.c ipx.c route.c \
-	unix.c atalk.c netgraph.c # iso.c ns.c tp_astring.c
+	unix.c atalk.c netgraph.c mroute6.c # iso.c ns.c tp_astring.c
 CFLAGS+=-Wall
 
 #CFLAGS+=-g
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 5f01f8eccc94..6ce6dcdd4047 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -133,7 +133,6 @@ static struct nlist nl[] = {
 	{ "_ipsecstat" },
 #define N_IPSEC6STAT	31
 	{ "_ipsec6stat" },
-#ifdef notyet
 #define N_PIM6STAT	32
 	{ "_pim6stat" },
 #define N_MRT6PROTO	33
@@ -144,7 +143,6 @@ static struct nlist nl[] = {
 	{ "_mf6ctable" },
 #define N_MIF6TABLE	36
 	{ "_mif6table" },
-#endif
 	{ "" },
 };
 
@@ -481,22 +479,18 @@ main(argc, argv)
 			if (af == AF_INET || af == AF_UNSPEC)
 				mrt_stats(nl[N_MRTSTAT].n_value);
 #ifdef INET6
-#ifdef notyet
 			if (af == AF_INET6 || af == AF_UNSPEC)
 				mrt6_stats(nl[N_MRT6STAT].n_value);
 #endif
-#endif
 		} else {
 			if (af == AF_INET || af == AF_UNSPEC)
 				mroutepr(nl[N_MFCTABLE].n_value,
 					 nl[N_VIFTABLE].n_value);
 #ifdef INET6
-#ifdef notyet
 			if (af == AF_INET6 || af == AF_UNSPEC)
 				mroute6pr(nl[N_MF6CTABLE].n_value,
 					  nl[N_MIF6TABLE].n_value);
 #endif
-#endif
 		}
 		exit(0);
 	}
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index 83dbd08958ea..74706c7eb0fe 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -82,7 +82,7 @@ mroutepr(mfcaddr, vifaddr)
 	vifi_t maxvif = 0;
 
 	if (mfcaddr == 0 || vifaddr == 0) {
-		printf("No multicast routing compiled into this system.\n");
+		printf("No IPv4 multicast routing compiled into this system.\n");
 		return;
 	}
 
diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
new file mode 100644
index 000000000000..3730a9e49ee9
--- /dev/null
+++ b/usr.bin/netstat/mroute6.c
@@ -0,0 +1,235 @@
+/*
+ * Copyright (C) 1998 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1989 Stephen Deering
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Stephen Deering of Stanford University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)mroute.c	8.2 (Berkeley) 4/28/95
+ *	$FreeBSD$
+ */
+
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/protosw.h>
+
+#include <net/if.h>
+#include <net/if_var.h>
+
+#include <netinet/in.h>
+
+#include <stdio.h>
+
+#define	KERNEL 1
+#include <netinet6/ip6_mroute.h>
+#undef KERNEL
+
+#include "netstat.h"
+
+#define	WID_ORG	(lflag ? 39 : (nflag ? 29 : 18)) /* width of origin column */
+#define	WID_GRP	(lflag ? 18 : (nflag ? 16 : 18)) /* width of group column */
+
+extern char	*routename6 __P((struct sockaddr_in6 *));
+
+void
+mroute6pr(mfcaddr, mifaddr)
+	u_long mfcaddr, mifaddr;
+{
+	struct mf6c *mf6ctable[MF6CTBLSIZ], *mfcp;
+	struct mif6 mif6table[MAXMIFS];
+	struct mf6c mfc;
+	struct rtdetq rte, *rtep;
+	register struct mif6 *mifp;
+	register mifi_t mifi;
+	register int i;
+	register int banner_printed;
+	register int saved_nflag;
+	mifi_t maxmif = 0;
+	long int waitings;
+
+	if (mfcaddr == 0 || mifaddr == 0) {
+		printf("No IPv6 multicast routing compiled into this"
+		       "system.\n");
+		return;
+	}
+
+	saved_nflag = nflag;
+	nflag = 1;
+
+	kread(mifaddr, (char *)&mif6table, sizeof(mif6table));
+	banner_printed = 0;
+	for (mifi = 0, mifp = mif6table; mifi < MAXMIFS; ++mifi, ++mifp) {
+		struct ifnet ifnet;
+		char ifname[IFNAMSIZ];
+
+		if (mifp->m6_ifp == NULL)
+			continue;
+
+		kread((u_long)mifp->m6_ifp, (char *)&ifnet, sizeof(ifnet));
+		maxmif = mifi;
+		if (!banner_printed) {
+			printf("\nIPv6 Multicast Interface Table\n"
+			       " Mif   Rate   PhyIF   "
+			       "Pkts-In   Pkts-Out\n");
+			banner_printed = 1;
+		}
+
+		printf("  %2u   %4d",
+		       mifi, mifp->m6_rate_limit);
+		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);
+	}
+	if (!banner_printed)
+		printf("\nIPv6 Multicast Interface Table is empty\n");
+
+	kread(mfcaddr, (char *)&mf6ctable, sizeof(mf6ctable));
+	banner_printed = 0;
+	for (i = 0; i < MF6CTBLSIZ; ++i) {
+		mfcp = mf6ctable[i];
+		while(mfcp) {
+			kread((u_long)mfcp, (char *)&mfc, sizeof(mfc));
+			if (!banner_printed) {
+				printf ("\nIPv6 Multicast Forwarding Cache\n");
+				printf(" %-*.*s %-*.*s %s",
+				       WID_ORG, WID_ORG, "Origin",
+				       WID_GRP, WID_GRP, "Group",
+				       "  Packets Waits In-Mif  Out-Mifs\n");
+				banner_printed = 1;
+			}
+
+			printf(" %-*.*s", WID_ORG, WID_ORG,
+			       routename6(&mfc.mf6c_origin));
+			printf(" %-*.*s", WID_GRP, WID_GRP,
+			       routename6(&mfc.mf6c_mcastgrp));
+			printf(" %9qu", mfc.mf6c_pkt_cnt);
+
+			for (waitings = 0, rtep = mfc.mf6c_stall; rtep; ) {
+				waitings++;
+				kread((u_long)rtep, (char *)&rte, sizeof(rte));
+				rtep = rte.next;
+			}
+			printf("   %3ld", waitings);
+
+			if (mfc.mf6c_parent == MF6C_INCOMPLETE_PARENT)
+				printf(" ---   ");
+			else
+				printf("  %3d   ", mfc.mf6c_parent);
+			for (mifi = 0; mifi <= maxmif; mifi++) {
+				if (IF_ISSET(mifi, &mfc.mf6c_ifset))
+					printf(" %u", mifi);
+			}
+			printf("\n");
+
+			mfcp = mfc.mf6c_next;
+		}
+	}
+	if (!banner_printed)
+		printf("\nIPv6 Multicast Routing Table is empty\n");
+
+	printf("\n");
+	nflag = saved_nflag;
+}
+
+void
+mrt6_stats(mstaddr)
+	u_long mstaddr;
+{
+	struct mrt6stat mrtstat;
+
+	if (mstaddr == 0) {
+		printf("No IPv6 multicast routing compiled into this"
+		       "system.\n");
+		return;
+	}
+
+	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));
+}
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index 5ae8c7f46ece..3b435c2f6ae6 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -78,11 +78,9 @@ void	ip6_stats __P((u_long, char *));
 void	ip6_ifstats __P((char *));
 void	icmp6_stats __P((u_long, char *));
 void	icmp6_ifstats __P((char *));
-#ifdef notyet
 void	pim6_stats __P((u_long, char *));
 void	mroute6pr __P((u_long, u_long));
 void	mrt6_stats __P((u_long));
-#endif
 #endif /*INET6*/
 
 void	bdg_stats __P((u_long, char *));