system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 10:19:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

pflow: netstat statistics

Browse source 
Expose pflow counters via netstat.

Sponsored by:	Rubicon Communications, LLC ("Netgate")
Differential Revision:	https://reviews.freebsd.org/D43107
This commit is contained in:
Kristof Provost 2023-12-06 14:55:33 +01:00
parent f92d9b1aad
commit 5dea523bd2
5 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/netpfil/pf/pflow.c
View file

@ -128,13 +128,19 @@ VNET_DEFINE(CK_LIST_HEAD(, pflow_softc), pflowif_list);
#define V_pflowif_list VNET(pflowif_list)
VNET_DEFINE(struct mtx, pflowif_list_mtx);
#define V_pflowif_list_mtx VNET(pflowif_list_mtx)
VNET_DEFINE(struct pflowstats, pflowstats);
#define V_pflowstats VNET(pflowstats)
VNET_DEFINE(struct pflowstats, pflowstat);
#define V_pflowstats VNET(pflowstat)
#define PFLOW_LOCK(_sc) mtx_lock(&(_sc)->sc_lock)
#define PFLOW_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_lock)
#define PFLOW_ASSERT(_sc) mtx_assert(&(_sc)->sc_lock, MA_OWNED)
SYSCTL_NODE(_net, OID_AUTO, pflow, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"PFLOW");
SYSCTL_STRUCT(_net_pflow, OID_AUTO, stats, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(pflowstat), pflowstats,
"PFLOW statistics (struct pflowstats, net/if_pflow.h)");
static void
vnet_pflowattach(void)
{

26
usr.bin/netstat/if.c
View file

@ -45,6 +45,7 @@
#include <arpa/inet.h>
#ifdef PF
#include <net/pfvar.h>
#include <net/pflow.h>
#include <net/if_pfsync.h>
#endif
@ -181,6 +182,31 @@ pfsync_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
#undef p
xo_close_container(name);
}
void
pflow_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
{
struct pflowstats pflowstat;
if (fetch_stats("net.pflow.stats", off, &pflowstat,
sizeof(pflowstat), kread) != 0)
return;
xo_emit("{T:/%s}:\n", name);
xo_open_container(name);
#define p(f, m) if (pflowstat.f || sflag <= 1) \
xo_emit(m, (uintmax_t)pflowstat.f, plural(pflowstat.f))
p(pflow_flows, "\t{:flows/%ju} {N:/flow%s sent}\n");
p(pflow_packets, "\t{:packets/%ju} {N:/packet%s sent}\n");
p(pflow_onomem, "\t{:nomem/%ju} "
"{N:/send failed due to mbuf memory error}\n");
p(pflow_oerrors, "\t{:send-error/%ju} {N:/send error}\n");
#undef p
xo_close_container(name);
}
#endif /* PF */
/*

2
usr.bin/netstat/main.c
View file

@ -116,6 +116,8 @@ static struct protox {
#ifdef PF
{ -1, N_PFSYNCSTATS, 1, NULL,
pfsync_stats, NULL, "pfsync", 1, 0 },
{ -1, N_PFLOWSTATS, 1, NULL,
pflow_stats, NULL, "pflow", 1, 0 },
#endif
{ -1, N_ARPSTAT, 1, NULL,
arp_stats, NULL, "arp", 1, 0 },

1
usr.bin/netstat/netstat.h
View file

@ -96,6 +96,7 @@ void igmp_stats(u_long, const char *, int, int);
void pim_stats(u_long, const char *, int, int);
void carp_stats(u_long, const char *, int, int);
void pfsync_stats(u_long, const char *, int, int);
void pflow_stats(u_long, const char *, int, int);
#ifdef IPSEC
void ipsec_stats(u_long, const char *, int, int);
void esp_stats(u_long, const char *, int, int);

1
usr.bin/netstat/nlist_symbols
View file

@ -31,6 +31,7 @@ all _nws_array
all _nws_count
all _pfkeystat
all _pfsyncstats
all _pflowstats
all _pim6stat
all _pimstat
all _rip6stat