5 files changed, 47 insertions, 1 deletions

diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index 45ef5f7e777e..935d4b8483a3 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -1,10 +1,13 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	systat
 CFLAGS+=-I${.CURDIR}/../../sys
 SRCS=	cmds.c cmdtab.c devs.c fetch.c iostat.c keyboard.c main.c \
-	mbufs.c netcmds.c netstat.c pigs.c swap.c icmp.c mode.c ip.c tcp.c \
+	mbufs.c netcmds.c netstat.c pigs.c swap.c icmp.c icmp6.c \
+	mode.c ip.c ip6.c tcp.c \
 	vmstat.c
+CFLAGS+=-DINET6
 DPADD=	${LIBCURSES} ${LIBTERMCAP} ${LIBM} ${LIBKVM} ${LIBDEVSTAT}
 LDADD=	-lcurses -ltermcap -lm -lkvm -ldevstat
 BINGRP=	kmem
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index ffb0259d474a..bec9d4feebe2 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -68,6 +68,14 @@ struct	cmdtab cmdtab[] = {
 	{ "ip",		showip,		fetchip,	labelip,
 	  initip,	openip,		closeip,	cmdmode,
 	  resetip,	CF_LOADAV },
+#ifdef INET6
+	{ "icmp6",	showicmp6,	fetchicmp6,	labelicmp6,
+	  initicmp6,	openicmp6,	closeicmp6,	cmdmode,
+	  reseticmp6,	CF_LOADAV },
+	{ "ip6",	showip6,	fetchip6,	labelip6,
+	  initip6,	openip6,	closeip6,	cmdmode,
+	  resetip6,	CF_LOADAV },
+#endif
 	{ "tcp",	showtcp,	fetchtcp,	labeltcp,
 	  inittcp,	opentcp,	closetcp,	cmdmode,
 	  resettcp,	CF_LOADAV },
diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h
index 1fb734e6287c..b0bdc98f9647 100644
--- a/usr.bin/systat/extern.h
+++ b/usr.bin/systat/extern.h
@@ -72,7 +72,9 @@ int	 checkhost __P((struct inpcb *));
 int	 checkport __P((struct inpcb *));
 void	 closeiostat __P((WINDOW *));
 void	 closeicmp __P((WINDOW *));
+void	 closeicmp6 __P((WINDOW *));
 void	 closeip __P((WINDOW *));
+void	 closeip6 __P((WINDOW *));
 void	 closekre __P((WINDOW *));
 void	 closembufs __P((WINDOW *));
 void	 closenetstat __P((WINDOW *));
@@ -90,7 +92,9 @@ int	 dkinit __P((void));
 int	 dkcmd __P((char *, char *));
 void	 error __P((const char *fmt, ...)) __printflike(1, 2);
 void	 fetchicmp __P((void));
+void	 fetchicmp6 __P((void));
 void	 fetchip __P((void));
+void	 fetchip6 __P((void));
 void	 fetchiostat __P((void));
 void	 fetchkre __P((void));
 void	 fetchmbufs __P((void));
@@ -99,7 +103,9 @@ void	 fetchpigs __P((void));
 void	 fetchswap __P((void));
 void	 fetchtcp __P((void));
 int	 initicmp __P((void));
+int	 initicmp6 __P((void));
 int	 initip __P((void));
+int	 initip6 __P((void));
 int	 initiostat __P((void));
 int	 initkre __P((void));
 int	 initmbufs __P((void));
@@ -110,7 +116,9 @@ int	 inittcp __P((void));
 int	 keyboard __P((void));
 int	 kvm_ckread __P((void *, void *, int));
 void	 labelicmp __P((void));
+void	 labelicmp6 __P((void));
 void	 labelip __P((void));
+void	 labelip6 __P((void));
 void	 labeliostat __P((void));
 void	 labelkre __P((void));
 void	 labelmbufs __P((void));
@@ -123,7 +131,9 @@ void	 load __P((void));
 int	 netcmd __P((char *, char *));
 void	 nlisterr __P((struct nlist []));
 WINDOW	*openicmp __P((void));
+WINDOW	*openicmp6 __P((void));
 WINDOW	*openip __P((void));
+WINDOW	*openip6 __P((void));
 WINDOW	*openiostat __P((void));
 WINDOW	*openkre __P((void));
 WINDOW	*openmbufs __P((void));
@@ -133,10 +143,14 @@ WINDOW	*openswap __P((void));
 WINDOW	*opentcp __P((void));
 int	 prefix __P((char *, char *));
 void	 reseticmp __P((void));
+void	 reseticmp6 __P((void));
 void	 resetip __P((void));
+void	 resetip6 __P((void));
 void	 resettcp __P((void));
 void	 showicmp __P((void));
+void	 showicmp6 __P((void));
 void	 showip __P((void));
+void	 showip6 __P((void));
 void	 showiostat __P((void));
 void	 showkre __P((void));
 void	 showmbufs __P((void));
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 305c1339f1fe..ad977f96d222 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -53,6 +53,9 @@ static const char rcsid[] =
 #include <net/route.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
+#ifdef INET6
+#include <netinet/ip6.h>
+#endif
 #include <netinet/in_pcb.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/icmp_var.h>
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 8afc643e20f9..0ebd228197f5 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -88,8 +88,10 @@ flag expects
 .Ar display
 to be one of:
 .Ic icmp ,
+.Ic icmp6 ,
 .Ic iostat ,
 .Ic ip ,
+.Ic ip6 ,
 .Ic mbufs ,
 .Ic netstat ,
 .Ic pigs ,
@@ -195,6 +197,11 @@ mode.  The
 .Ic mode
 command with no argument will display the current mode in the command
 line.
+.It Ic icmp6
+This display is like the
+.Ic icmp
+display,
+but displays statistics for IPv6 ICMP.
 .It Ic ip
 Otherwise identical to the
 .Ic icmp
@@ -203,6 +210,15 @@ display, except that it displays
 and
 .Tn UDP
 statistics.
+.It Ic ip6
+Like the
+.Ic ip
+display,
+except that it displays
+.Tn IPv6
+statics.
+It does not display 
+.Tn UDP statistics.
 .It Ic tcp
 Like
 .Ic icmp ,
@@ -494,7 +510,9 @@ and all passthrough devices that provide access to CDROM drives.
 .Xr netstat 1 ,
 .Xr kvm 3 ,
 .Xr icmp 4 ,
+.Xr icmp6 4 ,
 .Xr ip 4 ,
+.Xr ip6 4 ,
 .Xr tcp 4 ,
 .Xr udp 4 ,
 .Xr iostat 8 ,