add IPv6 support from KAME. cleanup type matches with printf() format.

KAME_SCOPEID should be enabled after KAME get{addr,name}info(3) merge.

1 files changed, 43 insertions, 2 deletions

diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 94d8f6070b9..22b4a292acb 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: netstat.1,v 1.18 1999/09/01 17:22:03 aaron Exp $
+.\"	$OpenBSD: netstat.1,v 1.19 1999/12/08 12:30:17 itojun Exp $
 .\"	$NetBSD: netstat.1,v 1.11 1995/10/03 21:42:43 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1992, 1993
@@ -61,6 +61,15 @@
 .Op Fl p Ar protocol
 .Op Fl M Ar core
 .Op Fl N Ar system
+.Nm netstat
+.Op Fl p Ar protocol
+.Op Fl i
+.Op Fl I Ar Interface
+.Nm netstat
+.Op Fl s
+.Op Fl f Ar address_family
+.Op Fl i
+.Op Fl I Ar Interface
 .Sh DESCRIPTION
 The
 .Nm netstat
@@ -79,6 +88,8 @@ interval specified,
 will continuously display the information regarding packet
 traffic on the configured network interfaces.
 The fourth form displays statistics about the named protocol.
+The fifth and sixth forms display per interface statistics for
+the specified protocol or address family.
 .Pp
 The options are as follows:
 .Bl -tag -width flag
@@ -104,6 +115,9 @@ are recognized:
 .Ar inet ,
 for
 .Dv AF_INET ,
+.Ar inet6 ,
+for
+.Dv AF_INET6 ,
 .Ar ipx ,
 for
 .Dv AF_IPX ,
@@ -137,6 +151,19 @@ Show information about the specified interface;
 used with a
 .Ar wait
 interval as described below.
+If the
+.Fl f Ar address_family
+option (with the
+.Fl s
+option) or the
+.Fl p Ar protocol
+option is present, show per-interface statistics on the
+.Ar interface
+for the specfied
+.Ar address_family
+or
+.Ar protocol,
+respectively.
 .It Fl i
 Show the state of interfaces which have been auto-configured
 (interfaces statically configured into a system, but not
@@ -147,6 +174,18 @@ options is also present, multicast addresses currently in use are shown
 for each Ethernet interface and for each IP interface address.
 Multicast addresses are shown on separate lines following the interface
 address with which they are associated.
+If the
+.Fl f Ar address_family
+option (with the
+.Fl s
+option) or the
+.Fl p Ar protocol
+option is present, show per-interface statistics on all interfaces
+for the specfied
+.Ar address_family
+or
+.Ar protocol,
+respectively.
 .It Fl M Ar core
 Extract values associated with the name list from the specified core
 instead of the default
@@ -183,7 +222,8 @@ When
 .Fl s
 is also present, show routing statistics instead.
 .It Fl v
-Be verbose. This currently has no effect.
+Be verbose.
+Avoids truncation of long addresses.
 .It Fl w Ar wait
 Show network interface statistics at intervals of
 .Ar wait
@@ -301,6 +341,7 @@ The
 .Nm netstat
 command appeared in
 .Bx 4.2 .
+IPv6 support was added by WIDE/KAME project.
 .\" .Sh FILES
 .\" .Bl -tag -width /dev/kmem -compact
 .\" .It Pa /bsd