CVS log for src/usr.bin/netstat/if.c

Up to [cvs.NetBSD.org] / src / usr.bin / netstat

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Pull up following revision(s) (requested by mrg in ticket #42):

	usr.bin/netstat/if.c: revision 1.109

if not given an interface to monitor by default, pick the one
with the most bytes in/out the first time and keep using it.

in addition to picking the most likely intersting interface,
this actually fixes a bug where interfaces coming/going in
the middle of eg, "netstat -b -w 1", may end up showing the
data for another interface on any output line (including the
the header declaring the interface!)

if not given an interface to monitor by default, pick the one
with the most bytes in/out the first time and keep using it.

in addition to picking the most likely intersting interface,
this actually fixes a bug where interfaces coming/going in
the middle of eg, "netstat -b -w 1", may end up showing the
data for another interface on any output line (including the
the header declaring the interface!)

Use warn() instead of warnx() and simplify.

netstat/if.c: Fix error message with "-w" option.

Now ifq_drops is 64bit unsigned integer.

No description in src/doc/CHANGES?

Make ifq_drops in struct ifqueue and struct ifaltq 64 bit.

s/u_quad_t/uint64_t/. No functional change.

Pull up the following, requested by msaitoh in ticket #1762:

	usr.bin/netstat/atalk.c		1.18,1.20-1.21
	usr.bin/netstat/bpf.c		1.16 via patch
	usr.bin/netstat/fast_ipsec.c	1.24 via patch
	usr.bin/netstat/if.c		1.97-1.99,1.101-1.104 via patch
	usr.bin/netstat/inet.c		1.111,1.115-1.116 via patch
	usr.bin/netstat/inet6.c		1.70,1.74-1.75,1.80-1.81 via patch
	usr.bin/netstat/main.c		1.100,1.102-1.103
	usr.bin/netstat/mbuf.c		1.34-1.35
	usr.bin/netstat/mroute.c	1.26-1.27
	usr.bin/netstat/mroute6.c	1.16
	usr.bin/netstat/netstat.h	1.52-1.53
	usr.bin/netstat/pfkey.c		1.4-1.5 via patch
	usr.bin/netstat/pfsync.c	1.4-1.5 via patch
	usr.bin/netstat/route.c		1.87-1.88
	usr.bin/netstat/unix.c		1.36-1.37
	usr.bin/netstat/vtw.c		1.11,1.13

- Add names of a few more ICMPv6 messages.
  Also make the array be explicitly 256 entries long.
- sprintf() -> snprintf(), and adjust a buffer size to avoid any
  potential for overflow.
- Add missing {IP,IP6}_STAT_NOIPSEC to netstat.
- Don't show any of the completely and utterly undocumented VTW info
  if the feature isn't enabled.
- Print oqdrops correctly.
- netstat.1: Add various xrefs present in the body to "See Also".
- Limit maximum owner name to appease gcc.
- KNF. Style fixes.

Pull up the following, requested by msaitoh in ticket #1522:

	usr.bin/netstat/atalk.c		1.18,1.20-1.21
	usr.bin/netstat/bpf.c		1.16 via patch
	usr.bin/netstat/fast_ipsec.c	1.24
	usr.bin/netstat/if.c		1.97-1.99,1.101-1.104 via patch
	usr.bin/netstat/inet.c		1.111,1.115-1.116 via patch
	usr.bin/netstat/inet6.c		1.74-1.75,1.80-1.81 via patch
	usr.bin/netstat/main.c		1.100-1.103
	usr.bin/netstat/mbuf.c		1.35
	usr.bin/netstat/mroute.c	1.26-1.27
	usr.bin/netstat/mroute6.c	1.16
	usr.bin/netstat/netstat.h	1.52-1.53
	usr.bin/netstat/pfkey.c		1.4-1.5 via patch
	usr.bin/netstat/pfsync.c	1.4-1.5 via patch
	usr.bin/netstat/route.c		1.86-1.88
	usr.bin/netstat/unix.c		1.36-1.37
	usr.bin/netstat/vtw.c		1.11,1.13

- sprintf() -> snprintf(), and adjust a buffer size to avoid any
  potential for overflow.
- Fix netstat -rs to print it correctly.
- Add missing {IP,IP6}_STAT_NOIPSEC to netstat.
- Don't show any of the completely and utterly undocumented VTW info
  if the feature isn't enabled.
- Print oqdrops correctly.
- Remove Network ATM soft intr queue reporting, we don't have that
  in the kernel anymore.
- netstat.1: Add various xrefs present in the body to "See Also".
- KNF. Style fixes.

Print oqdrops correctly in continuous display mode using with kvm.

Fix printing current output drop packet count in continuous display mode.

G.C. No functional change.

Print oqdrops correctly.

Get if_data correctly when kvm is used.

KNF. No functional change.

KNF. No functional change.

Use NULL instead of 0.

Merge changes from current as of 20200406

Update for per-cpu interface statistics.

Sync with HEAD

Sync with HEAD

Pull up following revision(s) (requested by msaitoh in ticket #939):
	usr.bin/netstat/if.c: revision 1.95
Print iqdrops, too. This change also fixes a bug that Odrops prints
iqdrops when kvm read failed.

 Print iqdrops, too. This change also fixes a bug that Odrops prints
iqdrops when kvm read failed.

Sync with HEAD

Sync with HEAD

Remove mkludge stuffs

For unknown reasons, IPv6 multicast addresses are linked to a first
IPv6 address assigned to an interface. Due to the design, when removing
a first address having multicast addresses, we need to save them to
somewhere and later restore them once a new IPv6 address is activated.
mkludge stuffs support the operations.

This change links multicast addresses to an interface directly and
throws the kludge away.

Note that as usual some obsolete member variables remain for kvm(3)
users. And also sysctl net.inet6.multicast_kludge remains to avoid
breaking old ifmcstat.

TODO: currently ifnet has a list of in6_multi but obviously the list
should be protocol independent. Provide a common structure (if_multi
or something) to handle in6_multi and in_multi together as well as
ifaddr does for in_ifaddr and in6_ifaddr.

re-do the previous to avoid malloc/free on the same size every iteration.

with this, or the previous, 'netstat -b 1' no longer leaks memory in
-current (or any older release using sysctl for this.)

sprinkle free

Fix showing multicast addresses of !IFF_UP interfaces

netstat appends '*' to the name of an interface without IFF_UP, so
if_nametoindex which is used in mc_print fails. mc_print needs just
an interface index so pass it instead of a tweaked interface name.

Sync with HEAD.  (Note that most of these changes are simply $NetBSD$
tag issues.)

Fix "sidewaysintpr", the thing that prints interface statistics in a
loop, to use signals properly. There are two copies of this code; one
uses kvm and the other uses sysctls. One copy had been updated to use
sigset_t and sigsuspend; the other was using vintage sigpause(). Sync
up the code so both use sigpause. Also, use sig_atomic_t, and block
SIGALRM when not waiting for it to avoid a small and unlikely but real
race.

Since the non-modernized copy of the code *had* for some been
modernized to use setitimer instead of just alarm(), propagate that
change to the other copy.

These copies could share more logic than they do.

more XXX removal.

XXX: removal

remove __P

dedup

use sysctl to print multicast addresses

fix sysctl based interface printing, and annotate where we should add the
missing multicast printing code.

PR/50872: David Binderman: Use logical and instead of arithmetic

query the window size and use it instead of assuming 24 lines.
now the header isn't re-printed a lot of times in tall windows.

Pull up following revision(s) (requested by prlw1 in ticket #395):
	sbin/route/rtutil.c: revision 1.4
	sbin/route/rtutil.h: revision 1.3
	usr.bin/netstat/if.c: revision 1.81
make netname4 match the netname6 signature avoiding a NULL pointer.
adjust to the netname4 prototype.

Pull up following revision(s) (requested by prlw1 in ticket #390):
	usr.bin/netstat/mroute.c: revision 1.25
	usr.bin/netstat/Makefile: revision 1.40
	sbin/route/prog_ops.h: revision 1.3
	sbin/route/rtutil.c: revision 1.1
	sbin/route/rtutil.h: revision 1.1
	usr.bin/netstat/mroute6.c: revision 1.15
	sbin/route/extern.h: revision 1.15
	usr.bin/netstat/show.c: file removal
	usr.bin/netstat/main.c: revision 1.93
	usr.bin/netstat/route.c: revision 1.83
	usr.bin/netstat/netstat.h: revision 1.51
	distrib/utils/x_route/Makefile: revision 1.18
	sbin/route/show.c: revision 1.46
	usr.bin/netstat/if.c: revision 1.80
	sbin/route/route.c: revision 1.145
	sbin/route/Makefile: revision 1.26
Factor out the netstat route printing code and use it here. There is no
point in having 2 different copies; fixes PR/49371

adjust to the netname4 prototype.

use the common code from route.c

Rebase to HEAD as of a few days ago.

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

use correct function and symbolic constants

use new scopeid functions

- avoid pointer gymnastics
- remove unused variables

resync from head

Retire OSI network stack. OK core@

Resync to 2012-11-19 00:00:00 UTC

sync with head

Pull up following revision(s) (requested by msaitoh in ticket #632):
	usr.bin/netstat/if.c: revision 1.75
Line up total numbers again (for -b case and -X case).

Line up total numbers again (for -b case and -X case).

sync with head

Use C89 function definitions

PR/44889: Yamamoto Takashi: netstat -d option is broken (from Elad)

Use __dead

Sync with HEAD

Use RT_ROUNDUP() and friends from sys/route.h instead of homegrown
variants.

Add netstat rump client.  For now, it always sets -X, i.e. will
use only sysctl and no kvm (implementing /dev/mem for a rump kernel
would probably not be hard, but still a non-zero effort).

Note: since there is absolutely no network activity in a fresh rump
kernel, rump.netstat usually displays exactly nothing when invoked
without parameters.  Arguments like -r, -bi, -p icmp etc. produce
more stuff.

Line up total numbers again.

Add -h, which makes output of bytes counts "humanized" (e.g. -bih)

(netstat had -h some 15 years ago, but since then it has been just
a fancy way of calling usage())

protecting sockaddr_in6 with -DINET6

Use PRIu64 for printf'ing stuff.  Fixes build breakage on part-amd64
introduced in rev 1.64 (and reverts a partial fix provided in rev 1.65)

Put some unsigned long long casts (as was in the original printing code).

Should fix build breakage noticed by pgoyette@ on current-users@:

    http://mail-index.netbsd.org/current-users/2009/09/13/msg010554.html

(sorry, don't have an amd64 anymore!)

Checkin work in progress to make netstat use sysctl rather than kvm(3).

This commit mostly adds code written by Claudio Jeker for OpenBSD to
support sysctl in the interface printing parts (-i, -I, -w). The port has
been ported to NetBSD with tiny adjustments -- of course all bugs etc.
are mine.

Also add and document a -X flag to force sysctl usage. The documentation
notes this flag may be removed at any time and its presence should not be
relied on.

Some misc. comments/#ifdef changes/code snippet moves as well.

Please note that no functionality should change as the routing and
interface printing code is still not fully supported.

Mailing list reference:

    http://mail-index.netbsd.org/tech-userlevel/2009/09/09/msg002604.html

Sync with HEAD.

Third (and last) commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html

Fix many WARNS=4 issues (-Wshadow -Wcast-qual -Wsign-compare).
Fix probable bug with numeric printing of anon ports when using sysctl.

sync with head.

netns is no longer in the tree; completely purge it from netstat(1).

Conditionalize XNS support.  No longer enabled.

Sync with head.

Make netstat use sysctl when dumping routing tables/stats.
Heavily based on similar code from Claudio Jeker (at OpenBSD).

While here, fix inet/inet6 sysctl stuff commited previously to
actually work, and some other nits to make netstat more sysctl
friendly.

One step closer to losing setgid kmem on this one...

Added #include <kvm.h> since netstat.h, which is included too, needs it.

NI_WITHSCOPEID was not picked up by IETF standardization process.

Use itimerval() instead of alarm() for interval displaying. This increases
accuracy on interval stats also on fast machines.

correct strange indentation

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22365, verified by myself.

use proper #ifdef to determine behavior (__KAME__)

make char array bigger where it seems too small and may overrun.

use macro to determine link-local multicast addr

identify kame scopeid hack with KAME_SCOPEID

make an auto const variable static.

Use getnameinfo() for printing link-layer addresses in netstat -i, rather
than doing it ourselves.

pedant changes for strcpy/sprintf.

convert to use getprogname()

Print out IEEE1394 addresses with : .  Add a hack to limit the address
to 8 bytes.

Pull up revision 1.45 (requested by he):
  Format string cleanup.

Pullup usr.bin string format fixes [is].
See "cvs log" for explicit revision numbers per file, from sommerfeld.

More format string cleanup by sommerfeld.

more stats.  from kame

Pull up rev. 1.41:
with -inv flag, do not truncate name of the interface (like "strip0").

Allocate one more byte for the asterisk after the name of interface.

Make gcc 2.96 (and maybe earlier) happier.  Include <stdlib.h>,<string.>,
etc. as appropriate to get exit,srncmp,abs,abort,etc.
Add -I${.CURDIR} to a few Makefiles

with -inv flag, do not truncate name of the interface (like "strip0").

Define members previously defined as u_long in struct iftot as u_quad_t.
Since these members are used to hold members defined now as u_quad_t
in struct if_data, u_long is quite not enough actually.
Without this, one night ttcp easily makes netstat to produce wrong output
like this:
enami@annex-2f-floor-244% netstat -ibw 1 -I tlp0
   tlp0 in            tlp0 out          total in           total out
     bytes               bytes             bytes               bytes
176333740607          176914940420         240082591           821282404
176093659136          176093659136                 0                   0
176093659136          176093659136                 0                   0

use NI_WITHSCOPEID when printing multicast group with -inav.

print IPv6 scopeid on -inv.  with -in, scopeid is omitted due to insufficient
width.

better sync with #ifdef notdef part (in -i for AF_INET).

don't truncate IPv4 entries on -i (with -v).  it is mainly for
"Network" column (13 digits, it will be 18 digits in maximum).

print IPv6 multicast group on -ia (-iav will avoid truncation)

Pull up to last week's -current.

per-interface statistics.
bring in and enable KAME scopeid hack.
lots of cleanups.
(sync with latest KAME)

Change printf formats for 64bit counters.

make netstat IPv6-ready.

Make the damned columns line up.

pull up rev 1.30 from trunk (mrg)

#ifndef SMALL changes.  saves 30k on the sparc

Add { and } to shut up egcs. Reformat the more questionable code.

- KNF
- use err(3)
- sprintf/strcpy -> snprintf/strncpy
- change route.c:domask() to take a size_t of the buffer passed.

Partial fix for PR kern/5435 -- changed netstat to use unsigned counters
instead of signed.  The rest of the fix will have to wait for 64-bit counters.

Add support for a '-b' option to provide byte counts in and out,
instead of just packet counts.  On the byte screens, errors and
collisions are not shown, since they are more packet count related.

fix up .Nm usage, getopt returns -1 not EOF

PR/3660: Dave Huang: Fix formatting misalignments in appletalk
PR/3659: Dave Huang: Fix PCB reporting in appletalk

file if.c was added on branch SYN_cache_branch on 1997-05-22 17:21:28 +0000

PR/3660: Dave Huang: Fix formatting misalignments in appletalk
PR/3659: Dave Huang: Fix PCB reporting in appletalk

more column alignment fixes

PR/3451: Anders Hjalmarsson: Column alignment fixes after the netatalk addition.

- netatalk additions
- printf format fixes
- minor prototype cleanups

Print Ethernet and FDDI addresses in the same format as ether_ntoa().
From Matt Thomas <matt@3am-software.com>

imported from 44lite2

Update from trunk:

Fix missing `)' in the sideways view of interfaces (i.e. netstat -w 1).
Bug pointed out by Chris G. Demetriou.

Fix missing `)' in the sideways view of interfaces (i.e. netstat -w 1).
Bug pointed out by Chris G. Demetriou.

pull up changes from the trunk:
>if doing 'netstat -I <intf> -w <delay>', and netstat can't find an
>interface of the given name, print an error message and exit.
>This whole section of code needs to be re-thought, if interfaces
>can be dynamically added or removed.
and:
>bump MAXIF (the maximum number of interfaces for which information is kept,
>for 'netstat -w <delay>') to 100, from 10.  10 was definitely not sufficient
>for many hosts; 100 should be for most if not all.  This code really should
>dynamically allocate the information structures, based on the number of
>interfaces in the kernel, account for interfaces that are added or removed,
>etc., but given its current structure that would require substantial changes.

bump MAXIF (the maximum number of interfaces for which information is kept,
for 'netstat -w <delay>') to 100, from 10.  10 was definitely not sufficient
for many hosts; 100 should be for most if not all.  This code really should
dynamically allocate the information structures, based on the number of
interfaces in the kernel, account for interfaces that are added or removed,
etc., but given its current structure that would require substantial changes.

if doing 'netstat -I <intf> -w <delay>', and netstat can't find an
interface of the given name, print an error message and exit.
This whole section of code needs to be re-thought, if interfaces
can be dynamically added or removed.

Kill a couple of unnecessary calls to strlen().

Update for the changes to struct ifnet.  While I'm here, fix a couple
of long-standing bugs:

	- Actually deal with the fact that the kernel ifnet list is
	  a TAILQ; it just happened to work before.

	- Use kvm_openfiles() instead of kvm_open().  The code passed
	  arguments to kvm_open() as if it were kvm_openfiles(), but
	  apparently went unnoticed since the prototypes are the same.
	  Amusing bit: there were XXX's in the code which seemed to
	  apologize for a verbose libkvm, when it happened to be a
	  bug in netstat!

Implement change done in revision 1.12 (for PR #1473 & duplicates) in a
slightly different way.  This widens the Address field instead of the
Ipkts field because Address is the one that may be too big.

New-style RCS ids.

Change formatting so that columns line up; PR #1473 + several duplicates

Remove an extra htonl().

Update to match kernel changes.

Import original 4.4-Lite version.

Align link address under `Address' header.

Clean up import.

kill lots of off_t's.

clean up, for off_t...  ugliest 'cleaning' possible, i think...

netname() takes a struct in_addr, not an int. Breaks on sparc.
fix from Chuck Cranor <chuck@maria.wustl.edu>

fix to print netstat unit number right; from Greenman

Add RCS identifiers.

Included Havard Eidnes' latest changes.

after 0.2.2 "stable" patches applied