diff options
author | delphij <delphij@FreeBSD.org> | 2010-01-11 03:00:17 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2010-01-11 03:00:17 +0000 |
commit | 689b6abf98d8f9ae31541c526ff14fc4fda4b89a (patch) | |
tree | 4537c5f251f23f5af949235408238038d1629b23 /usr.bin | |
parent | 79a9b4bd2a3f4910584fbd4160ac49e0d62446c1 (diff) | |
download | FreeBSD-src-689b6abf98d8f9ae31541c526ff14fc4fda4b89a.zip FreeBSD-src-689b6abf98d8f9ae31541c526ff14fc4fda4b89a.tar.gz |
Add a new option, -q howmany, which when used in conjuction with -w,
exits netstat after _howmany_ outputs.
Requested by: thomasa
Reviewed by: freebsd-net (bms, old version in early 2007)
MFC after: 1 month
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/netstat/if.c | 2 | ||||
-rw-r--r-- | usr.bin/netstat/main.c | 10 | ||||
-rw-r--r-- | usr.bin/netstat/netstat.1 | 8 | ||||
-rw-r--r-- | usr.bin/netstat/netstat.h | 1 |
4 files changed, 18 insertions, 3 deletions
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index 02f390a..50c8fdc 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -679,6 +679,8 @@ loop: if (!first) putchar('\n'); fflush(stdout); + if ((noutputs != 0) && (--noutputs == 0)) + exit(0); oldmask = sigblock(sigmask(SIGALRM)); while (!signalled) sigpause(0); diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index fec7172..cd701df 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -334,6 +334,7 @@ int hflag; /* show counters in human readable format */ int iflag; /* show interfaces */ int Lflag; /* show size of listen queues */ int mflag; /* show memory stats */ +int noutputs = 0; /* how much outputs before we exit */ int numeric_addr; /* show addresses numerically */ int numeric_port; /* show ports numerically */ static int pflag; /* show given protocol */ @@ -359,7 +360,7 @@ main(int argc, char *argv[]) af = AF_UNSPEC; - while ((ch = getopt(argc, argv, "AaBbdf:ghI:iLlM:mN:np:rSsuWw:xz")) != -1) + while ((ch = getopt(argc, argv, "AaBbdf:ghI:iLlM:mN:np:q:rSsuWw:xz")) != -1) switch(ch) { case 'A': Aflag = 1; @@ -445,6 +446,11 @@ main(int argc, char *argv[]) } pflag = 1; break; + case 'q': + noutputs = atoi(optarg); + if (noutputs != 0) + noutputs++; + break; case 'r': rflag = 1; break; @@ -779,7 +785,7 @@ usage(void) " [-M core] [-N system]", " netstat -i | -I interface [-abdhnW] [-f address_family]\n" " [-M core] [-N system]", -" netstat -w wait [-I interface] [-d] [-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" " [-M core] [-N system]", " netstat -i | -I interface -s [-f protocol_family | -p protocol]\n" diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1 index 587cbb2..7767847 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -32,7 +32,7 @@ .\" @(#)netstat.1 8.8 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd July 9, 2009 +.Dd January 10, 2010 .Dt NETSTAT 1 .Os .Sh NAME @@ -133,6 +133,7 @@ is also present, print interface names using a wider field size. .Op Fl d .Op Fl M Ar core .Op Fl N Ar system +.Op Fl q Ar howmany .Ek .Xc At intervals of @@ -143,6 +144,11 @@ traffic on all configured network interfaces or a single .Ar interface . If +.Fl q +is also present, exit after +.Ar howmany +outputs. +If .Fl d is also present, show the number of dropped packets. .It Xo diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h index c224f46..485901d 100644 --- a/usr.bin/netstat/netstat.h +++ b/usr.bin/netstat/netstat.h @@ -45,6 +45,7 @@ extern int hflag; /* show counters in human readable format */ extern int iflag; /* show interfaces */ extern int Lflag; /* show size of listen queues */ extern int mflag; /* show memory stats */ +extern int noutputs; /* how much outputs before we exit */ extern int numeric_addr; /* show addresses numerically */ extern int numeric_port; /* show ports numerically */ extern int rflag; /* show routing tables (or routing stats) */ |