Author: melifaro
Date: Thu May 8 19:35:29 2014
New Revision: 265702
URL: http://svnweb.freebsd.org/changeset/base/265702
Log:
Merge r260524,r260540
r260524:
Add -4/-6 shorthand for -finet/-finet6 in route(8) and netstat(8).
r260540:
Bump dates in nestat(1) and route(8) man pages.
Fix several small errors introduced by r260524.
Suggested by: glebius
Modified:
stable/9/sbin/route/keywords
stable/9/sbin/route/route.8
stable/9/sbin/route/route.c
stable/9/usr.bin/netstat/main.c
stable/9/usr.bin/netstat/netstat.1
Directory Properties:
stable/9/sbin/ (props changed)
stable/9/sbin/route/ (props changed)
stable/9/usr.bin/ (props changed)
stable/9/usr.bin/netstat/ (props changed)
Modified: stable/9/sbin/route/keywords
==============================================================================
--- stable/9/sbin/route/keywords Thu May 8 19:35:12 2014
(r265701)
+++ stable/9/sbin/route/keywords Thu May 8 19:35:29 2014
(r265702)
@@ -1,6 +1,8 @@
# @(#)keywords 8.2 (Berkeley) 3/19/94
# $FreeBSD$
+4
+6
add
atalk
blackhole
Modified: stable/9/sbin/route/route.8
==============================================================================
--- stable/9/sbin/route/route.8 Thu May 8 19:35:12 2014 (r265701)
+++ stable/9/sbin/route/route.8 Thu May 8 19:35:29 2014 (r265702)
@@ -62,6 +62,14 @@ programmatic interface discussed in
.Pp
The following options are available:
.Bl -tag -width indent
+.It Fl 4
+Specify
+.Cm inet
+address family as family hint for subcommands.
+.It Fl 6
+Specify
+.Cm inet
+address family as family hint for subcommands.
.It Fl d
Run in debug-only mode, i.e., do not actually modify the routing table.
.It Fl n
@@ -134,10 +142,20 @@ When the address family may is specified
.Fl xns ,
.Fl atalk ,
.Fl inet6 ,
+.Fl 6,
+.Fl inet,
or
-.Fl inet
+.Fl 4
modifiers, only routes having destinations with addresses in the
-delineated family will be deleted.
+delineated family will be deleted. Additionally,
+.Fl 4
+or
+.Fl 6
+can be used as aliases for
+.Fl inet
+and
+.Fl inet6
+modifiers.
When a
.Fl fib
option is specified, the operation will be applied to
Modified: stable/9/sbin/route/route.c
==============================================================================
--- stable/9/sbin/route/route.c Thu May 8 19:35:12 2014 (r265701)
+++ stable/9/sbin/route/route.c Thu May 8 19:35:29 2014 (r265702)
@@ -153,7 +153,7 @@ usage(const char *cp)
if (cp != NULL)
warnx("bad keyword: %s", cp);
(void) fprintf(stderr,
- "usage: route [-dnqtv] command [[modifiers] args]\n");
+ "usage: route [-46dnqtv] command [[modifiers] args]\n");
exit(EX_USAGE);
/* NOTREACHED */
}
@@ -167,8 +167,24 @@ main(int argc, char **argv)
if (argc < 2)
usage(NULL);
- while ((ch = getopt(argc, argv, "nqdtv")) != -1)
+ while ((ch = getopt(argc, argv, "46nqdtv")) != -1)
switch(ch) {
+ case '4':
+#ifdef INET
+ af = AF_INET;
+ aflen = sizeof(struct sockaddr_in);
+#else
+ errx(1, "IPv4 support is not compiled in");
+#endif
+ break;
+ case '6':
+#ifdef INET6
+ af = AF_INET6;
+ aflen = sizeof(struct sockaddr_in6);
+#else
+ errx(1, "IPv6 support is not compiled in");
+#endif
+ break;
case 'n':
nflag = 1;
break;
@@ -389,10 +405,12 @@ flushroutes(int argc, char *argv[])
if (**argv != '-')
usage(*argv);
switch (keyword(*argv + 1)) {
+ case K_4:
case K_INET:
af = AF_INET;
break;
#ifdef INET6
+ case K_6:
case K_INET6:
af = AF_INET6;
break;
@@ -807,11 +825,13 @@ newroute(int argc, char **argv)
af = AF_LINK;
aflen = sizeof(struct sockaddr_dl);
break;
+ case K_4:
case K_INET:
af = AF_INET;
aflen = sizeof(struct sockaddr_in);
break;
#ifdef INET6
+ case K_6:
case K_INET6:
af = AF_INET6;
aflen = sizeof(struct sockaddr_in6);
Modified: stable/9/usr.bin/netstat/main.c
==============================================================================
--- stable/9/usr.bin/netstat/main.c Thu May 8 19:35:12 2014
(r265701)
+++ stable/9/usr.bin/netstat/main.c Thu May 8 19:35:29 2014
(r265702)
@@ -366,9 +366,23 @@ main(int argc, char *argv[])
af = AF_UNSPEC;
- while ((ch = getopt(argc, argv, "AaBbdf:ghI:iLlM:mN:np:Qq:rSTsuWw:xz"))
+ while ((ch = getopt(argc, argv,
"46AaBbdf:ghI:iLlM:mN:np:Qq:rSTsuWw:xz"))
!= -1)
switch(ch) {
+ case '4':
+#ifdef INET
+ af = AF_INET;
+#else
+ errx(1, "IPv4 support is not compiled in");
+#endif
+ break;
+ case '6':
+#ifdef INET6
+ af = AF_INET6;
+#else
+ errx(1, "IPv6 support is not compiled in");
+#endif
+ break;
case 'A':
Aflag = 1;
break;
@@ -805,21 +819,21 @@ static void
usage(void)
{
(void)fprintf(stderr,
"%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
-"usage: netstat [-AaLnSTWx] [-f protocol_family | -p protocol]\n"
+"usage: netstat [-46AaLnSTWx] [-f protocol_family | -p protocol]\n"
" [-M core] [-N system]",
-" netstat -i | -I interface [-abdhnW] [-f address_family]\n"
+" netstat -i | -I interface [-46abdhnW] [-f address_family]\n"
" [-M core] [-N system]",
-" netstat -w wait [-I interface] [-d] [-M core] [-N system] [-q
howmany]",
-" netstat -s [-s] [-z] [-f protocol_family | -p protocol]\n"
+" netstat -w wait [-I interface] [-46d] [-M core] [-N system] [-q
howmany]",
+" netstat -s [-s] [-46z] [-f protocol_family | -p protocol]\n"
" [-M core] [-N system]",
-" netstat -i | -I interface -s [-f protocol_family | -p protocol]\n"
+" netstat -i | -I interface [-46s] [-f protocol_family | -p protocol]\n"
" [-M core] [-N system]",
" netstat -m [-M core] [-N system]",
" netstat -B [-I interface]",
-" netstat -r [-AanW] [-f address_family] [-M core] [-N system]",
+" netstat -r [-46AanW] [-f address_family] [-M core] [-N system]",
" netstat -rs [-s] [-M core] [-N system]",
-" netstat -g [-W] [-f address_family] [-M core] [-N system]",
-" netstat -gs [-s] [-f address_family] [-M core] [-N system]",
+" netstat -g [-46W] [-f address_family] [-M core] [-N system]",
+" netstat -gs [-46s] [-f address_family] [-M core] [-N system]",
" netstat -Q");
exit(1);
}
Modified: stable/9/usr.bin/netstat/netstat.1
==============================================================================
--- stable/9/usr.bin/netstat/netstat.1 Thu May 8 19:35:12 2014
(r265701)
+++ stable/9/usr.bin/netstat/netstat.1 Thu May 8 19:35:29 2014
(r265702)
@@ -28,7 +28,7 @@
.\" @(#)netstat.1 8.8 (Berkeley) 4/18/94
.\" $FreeBSD$
.\"
-.Dd March 10, 2013
+.Dd May 8, 2014
.Dt NETSTAT 1
.Os
.Sh NAME
@@ -45,7 +45,7 @@ depending on the options for the informa
.It Xo
.Bk -words
.Nm
-.Op Fl AaLnSTWx
+.Op Fl 46AaLnSTWx
.Op Fl f Ar protocol_family | Fl p Ar protocol
.Op Fl M Ar core
.Op Fl N Ar system
@@ -92,7 +92,7 @@ retransmits, out-of-order packets receiv
.Bk -words
.Nm
.Fl i | I Ar interface
-.Op Fl abdhnW
+.Op Fl 46abdhnW
.Op Fl f Ar address_family
.Op Fl M Ar core
.Op Fl N Ar system
@@ -155,7 +155,7 @@ is also present, show the number of drop
.Bk -words
.Nm
.Fl s Op Fl s
-.Op Fl z
+.Op Fl 46z
.Op Fl f Ar protocol_family | Fl p Ar protocol
.Op Fl M Ar core
.Op Fl N Ar system
@@ -176,6 +176,7 @@ is also present, reset statistic counter
.Bk -words
.Nm
.Fl i | I Ar interface Fl s
+.Op Fl 46
.Op Fl f Ar protocol_family | Fl p Ar protocol
.Op Fl M Ar core
.Op Fl N Ar system
@@ -216,7 +217,7 @@ states.
.Bk -words
.Nm
.Fl r
-.Op Fl AanW
+.Op Fl 46AanW
.Op Fl f Ar address_family
.Op Fl M Ar core
.Op Fl N Ar system
@@ -263,7 +264,7 @@ is repeated, counters with a value of ze
.Bk -words
.Nm
.Fl g
-.Op Fl W
+.Op Fl 46W
.Op Fl f Ar address_family
.Op Fl M Ar core
.Op Fl N Ar system
@@ -282,7 +283,7 @@ address families.
.Bk -words
.Nm
.Fl gs
-.Op Fl s
+.Op Fl 46s
.Op Fl f Ar address_family
.Op Fl M Ar core
.Op Fl N Ar system
@@ -311,6 +312,14 @@ The flags field shows available ISR hand
.Pp
Some options have the general meaning:
.Bl -tag -width flag
+.It Fl 4
+Is shorthand for
+.Fl f
+.Ar inet
+.It Fl 6
+Is shorthand for
+.Fl f
+.Ar inet6
.It Fl f Ar address_family , Fl p Ar protocol
Limit display to those records
of the specified
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
