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

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

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Rename local bpf_* functions to nsbpf_* to avoid conflicts with
new libpcap bpf_* functions

netstat/bpf.c: Don't print garbage for stale pid

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.

KNF. No functional change.

netstat: strengthen against kernel changes

netstat uses sysctlbyname to get counter data from the kernel.
sysctlbyname fails with ENOMEM if actual counter data in the kernel is
larger than a passed buffer.  netstat just skips showing counters of a
category if sysctlbyname fails, so if we added new counters of the
category to the kernel, nestat shows nothing for the category.

Fortunately sysctlbyname fills data as much as possible even if a passed
buffer is short.  So we can allow netstat to show the filled data anyway
if sysctlbyname fails with ENOMEM.

Note that this backcompat mechanism works only if new counters are
appended, and doesn't work if new counters are inserted into the middle
or counters are moved.

Mostly merge changes from HEAD upto 20200411

Pull up following revision(s) (requested by kamil in ticket #94):

	usr.bin/netstat/netstat_rumpops.c: revision 1.2
	usr.bin/netstat/netstat_hostops.c: revision 1.2
	usr.bin/netstat/inet6.c: revision 1.73
	usr.bin/netstat/bpf.c: revision 1.14
	usr.bin/netstat/Makefile: revision 1.46
	usr.bin/netstat/prog_ops.h: revision 1.3
	usr.bin/netstat/pfsync.c: revision 1.2
	usr.bin/netstat/pfkey.c: revision 1.2
	usr.bin/netstat/fast_ipsec.c: revision 1.23
	usr.bin/netstat/atalk.c: revision 1.17
	usr.bin/netstat/inet.c: revision 1.110

netstat: Add indirection of symbols to remove clash with sanitizers

Add indirection and symbol renaming under MKSANITIZER for the linked in
version of sysctlbyname, sysctlgetmibinfo and sysctlnametomib.

netstat: Add indirection of symbols to remove clash with sanitizers

Add indirection and symbol renaming under MKSANITIZER for the linked in
version of sysctlbyname, sysctlgetmibinfo and sysctlnametomib.

Sync with HEAD

 Fix a bug that BPF_D_OUT isn't printed correctly.

 Implement the BPF direction filter (BIOC[GS]DIRECTION). It provides backward
compatibility with BIOC[GS]SEESENT ioctl. The userland interface is the same
as FreeBSD.

 This change also fixes a bug that the direction is misunderstand on some
environment by passing the direction to bpf_mtap*() instead of checking
m->m_pkthdr.rcvif.

resync with head

sync with head

Pull up following revision(s) (requested by msaitoh in ticket #1833):
	usr.bin/netstat/bpf.c: revision 1.11
Fix memory leak.

Pull up following revision(s) (requested by msaitoh in ticket #763):
	usr.bin/netstat/bpf.c: revision 1.11
Fix memory leak.

Fix memory leak.

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.

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.

Remove clause 3 and 4 from TNF licenses

Note which things are not available by KVM, and print a nice message
stating so if someone specifically asks for it.

PR/31347: Geoff C. Wing: netstat err message is ambiguous about cause
Applied patch, thanks!

Convert 3 printf() calls into one puts().

Place the sysctl code under an if block and print an error message if the
user tries to fetch information via kvm.

Discussed with Elad Efrat.

Request process information using sysctl(3) and not kvm(3) since bpf(4)
statistics and peers are only available using the former.

Fix printing formats.

Implemented the userland part of the BPF statistics and BPF peers,
net.bpf.stats and net.bpf.peers sysctls respectively. netstat(1) now
has an additional syntax:
	netstat [-s] [-B] [-I Interface]

Only the super user can see a list of BPF peers with the following command:
# netstat -B
Active BPF peers
PID     Int     Recv     Drop     Capt     Flags  Bufsize  Comm
4941    lo0     0        0        0        I--S-  262144   tcpdump
252     ex0     19668    0        5        I-RS-  32768    dhclient

And every user can see the BPF statistics with:
$ netstat -s -B
bpf:
        19669 total packets received
        5 total packets captured
        0 total packets dropped

This idea came from FreeBSD (Christian S.J. Peron) but, currently, they
doen't have a userland utility in the base system to read the sysctls.

Reviewed by: christos@