Merge bpfstat's functionality into the netstat(1) utility. This adds
a -B option which causes bpf peers to be printed. This option can be used in conjunction with -I if information about specific interfaces is desired. This is similar to what NetBSD added to their version of netstat. $ netstat -B Pid Netif Flags Recv Drop Match Sblen Hblen Command 1137 lo0 p--s-- 0 0 0 0 0 tcpdump 205 sis0 -ifs-l 37331 0 1 0 0 dhclient $ $ netstat -I lo0 -B Pid Netif Flags Recv Drop Match Sblen Hblen Command 1174 lo0 p--s-- 0 0 0 0 0 tcpdump $ -Add bpf.c which stores all the code for retrieving and parsing bpf related statistics. -Modify main.c to add support for the -B option and hook it into the program logic. -Add bpf.c to the build. -Document this new functionality in the man page and bump the revision date. -Add prototype for bpf_stats function.
This commit is contained in:
parent
3a9c56bec9
commit
6b463eed3a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=149862
@ -3,7 +3,7 @@
|
||||
|
||||
PROG= netstat
|
||||
SRCS= if.c inet.c inet6.c main.c mbuf.c mcast.c mroute.c route.c \
|
||||
unix.c atalk.c netgraph.c mroute6.c ipsec.c
|
||||
unix.c atalk.c netgraph.c mroute6.c ipsec.c bpf.c
|
||||
|
||||
WARNS?= 2
|
||||
NO_WERROR=
|
||||
|
119
usr.bin/netstat/bpf.c
Normal file
119
usr.bin/netstat/bpf.c
Normal file
@ -0,0 +1,119 @@
|
||||
/*-
|
||||
* Copyright (c) 2005 Christian S.J. Peron
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
#include <sys/types.h>
|
||||
#include <sys/protosw.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/user.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_var.h>
|
||||
#include <net/bpfdesc.h>
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "netstat.h"
|
||||
|
||||
/* print bpf stats */
|
||||
|
||||
static char *
|
||||
bpf_pidname(pid_t pid)
|
||||
{
|
||||
struct kinfo_proc newkp;
|
||||
int error, mib[4];
|
||||
size_t size;
|
||||
|
||||
mib[0] = CTL_KERN;
|
||||
mib[1] = KERN_PROC;
|
||||
mib[2] = KERN_PROC_PID;
|
||||
mib[3] = pid;
|
||||
size = sizeof(newkp);
|
||||
error = sysctl(mib, 4, &newkp, &size, NULL, 0);
|
||||
if (error < 0)
|
||||
return (strdup("??????"));
|
||||
return (strdup(newkp.ki_comm));
|
||||
}
|
||||
|
||||
static void
|
||||
bpf_flags(struct xbpf_d *bd, char *flagbuf)
|
||||
{
|
||||
|
||||
*flagbuf++ = bd->bd_promisc ? 'p' : '-';
|
||||
*flagbuf++ = bd->bd_immediate ? 'i' : '-';
|
||||
*flagbuf++ = bd->bd_hdrcmplt ? '-' : 'f';
|
||||
*flagbuf++ = bd->bd_seesent ? 's' : '.';
|
||||
*flagbuf++ = bd->bd_async ? 'a' : '-';
|
||||
*flagbuf++ = bd->bd_locked ? 'l' : '-';
|
||||
*flagbuf++ = '\0';
|
||||
}
|
||||
|
||||
void
|
||||
bpf_stats(char *interface)
|
||||
{
|
||||
struct xbpf_d *d, *bd;
|
||||
char *pname, flagbuf[12];
|
||||
size_t size;
|
||||
|
||||
if (sysctlbyname("net.bpf.stats", NULL, &size,
|
||||
NULL, 0) < 0) {
|
||||
warn("net.bpf.stats");
|
||||
return;
|
||||
}
|
||||
bd = malloc(size);
|
||||
if (bd == NULL) {
|
||||
warn("malloc failed");
|
||||
return;
|
||||
}
|
||||
if (sysctlbyname("net.bpf.stats", bd, &size,
|
||||
NULL, 0) < 0) {
|
||||
warn("net.bpf.stats");
|
||||
free(bd);
|
||||
return;
|
||||
}
|
||||
printf("%5s %6s %6s %9s %9s %9s %5s %5s %s\n",
|
||||
"Pid", "Netif", "Flags", "Recv", "Drop", "Match", "Sblen",
|
||||
"Hblen", "Command");
|
||||
for (d = &bd[0]; d < &bd[size / sizeof(*d)]; d++) {
|
||||
if (interface && strcmp(interface, d->bd_ifname) != 0)
|
||||
continue;
|
||||
bpf_flags(d, flagbuf);
|
||||
pname = bpf_pidname(d->bd_pid);
|
||||
printf("%5d %6s %6s %9lu %9lu %9lu %5d %5d %s\n",
|
||||
d->bd_pid, d->bd_ifname, flagbuf,
|
||||
d->bd_rcount, d->bd_dcount, d->bd_fcount,
|
||||
d->bd_slen, d->bd_hlen, pname);
|
||||
free(pname);
|
||||
}
|
||||
}
|
@ -270,6 +270,7 @@ static char *nlistf = NULL, *memf = NULL;
|
||||
|
||||
int Aflag; /* show addresses of protocol control block */
|
||||
int aflag; /* show all sockets (including servers) */
|
||||
int Bflag; /* show information about bpf consumers */
|
||||
int bflag; /* show i/f total bytes in/out */
|
||||
int dflag; /* show i/f dropped packets */
|
||||
int gflag; /* show group (multicast) routing or stats */
|
||||
@ -301,7 +302,7 @@ main(int argc, char *argv[])
|
||||
|
||||
af = AF_UNSPEC;
|
||||
|
||||
while ((ch = getopt(argc, argv, "Aabdf:ghI:iLlM:mN:np:rSstuWw:z")) != -1)
|
||||
while ((ch = getopt(argc, argv, "AaBbdf:ghI:iLlM:mN:np:rSstuWw:z")) != -1)
|
||||
switch(ch) {
|
||||
case 'A':
|
||||
Aflag = 1;
|
||||
@ -309,6 +310,9 @@ main(int argc, char *argv[])
|
||||
case 'a':
|
||||
aflag = 1;
|
||||
break;
|
||||
case 'B':
|
||||
Bflag = 1;
|
||||
break;
|
||||
case 'b':
|
||||
bflag = 1;
|
||||
break;
|
||||
@ -440,6 +444,10 @@ main(int argc, char *argv[])
|
||||
if (nlistf != NULL || memf != NULL)
|
||||
setgid(getgid());
|
||||
|
||||
if (Bflag) {
|
||||
bpf_stats(interface);
|
||||
exit(0);
|
||||
}
|
||||
if (mflag) {
|
||||
if (memf != NULL) {
|
||||
if (kread(0, 0, 0) == 0)
|
||||
|
@ -32,7 +32,7 @@
|
||||
.\" @(#)netstat.1 8.8 (Berkeley) 4/18/94
|
||||
.\" $FreeBSD$
|
||||
.\"
|
||||
.Dd August 19, 2005
|
||||
.Dd September 7, 2005
|
||||
.Dt NETSTAT 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -194,6 +194,19 @@ The network manages a private pool of memory buffers.
|
||||
.It Xo
|
||||
.Bk -words
|
||||
.Nm
|
||||
.Fl B
|
||||
.Op Fl I Ar interface
|
||||
.Ek
|
||||
.Xc
|
||||
Show statistics about
|
||||
.Xr bpf 4
|
||||
peers. This includes information like
|
||||
how many packets have been matched, dropped and recieved by the
|
||||
bpf device, also information about current buffer sizes and device
|
||||
states.
|
||||
.It Xo
|
||||
.Bk -words
|
||||
.Nm
|
||||
.Fl r
|
||||
.Op Fl AanW
|
||||
.Op Fl f Ar address_family
|
||||
|
@ -154,3 +154,4 @@ void tp_stats(caddr_t, caddr_t);
|
||||
void ifmalist_dump(void);
|
||||
void mroutepr(u_long, u_long);
|
||||
void mrt_stats(u_long);
|
||||
void bpf_stats(char *);
|
||||
|
Loading…
Reference in New Issue
Block a user