diff options
| author | glebius <glebius@FreeBSD.org> | 2013-10-29 17:38:13 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2013-10-29 17:38:13 +0000 |
| commit | b0bc7b1d54670db8d6c891ef9a5c1cda849a2fac (patch) | |
| tree | cc23fdb574448e1dae2d0149e33fec5d0ea23fe7 /usr.bin/netstat | |
| parent | 8d47955f2179652405fb66d1978831eddd7a07cd (diff) | |
| download | FreeBSD-src-b0bc7b1d54670db8d6c891ef9a5c1cda849a2fac.zip FreeBSD-src-b0bc7b1d54670db8d6c891ef9a5c1cda849a2fac.tar.gz | |
Make userland tools honor WITHOUT_PF build option.
Tested by: dt71@gmx.com
Diffstat (limited to 'usr.bin/netstat')
| -rw-r--r-- | usr.bin/netstat/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/netstat/if.c | 8 | ||||
| -rw-r--r-- | usr.bin/netstat/main.c | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile index 1071f0e..3e25077 100644 --- a/usr.bin/netstat/Makefile +++ b/usr.bin/netstat/Makefile @@ -26,6 +26,10 @@ CFLAGS+=-DINET6 CFLAGS+=-DSDP .endif +.if ${MK_PF} != "no" +CFLAGS+=-DPF +.endif + BINGRP= kmem BINMODE=2555 DPADD= ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL} diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index c0074c0..573a75d 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -48,13 +48,15 @@ __FBSDID("$FreeBSD$"); #include <net/if_dl.h> #include <net/if_types.h> #include <net/ethernet.h> -#include <net/pfvar.h> -#include <net/if_pfsync.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netipx/ipx.h> #include <netipx/ipx_if.h> #include <arpa/inet.h> +#ifdef PF +#include <net/pfvar.h> +#include <net/if_pfsync.h> +#endif #include <err.h> #include <errno.h> @@ -80,6 +82,7 @@ static void sidewaysintpr(int); static char addr_buf[NI_MAXHOST]; /* for getnameinfo() */ #endif +#ifdef PF static const char* pfsyncacts[] = { /* PFSYNC_ACT_CLR */ "clear all request", /* PFSYNC_ACT_INS */ "state insert", @@ -154,6 +157,7 @@ pfsync_stats(u_long off, const char *name, int af1 __unused, int proto __unused) p(pfsyncs_oerrors, "\t\t%ju send error%s\n"); #undef p } +#endif /* PF */ /* * Display a formatted value, or a '-' in the same space. diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index feb97dc..d733e93 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -214,8 +214,10 @@ struct protox { pim_stats, NULL, "pim", 1, IPPROTO_PIM }, { -1, N_CARPSTAT, 1, NULL, carp_stats, NULL, "carp", 1, 0 }, +#ifdef PF { -1, N_PFSYNCSTAT, 1, NULL, pfsync_stats, NULL, "pfsync", 1, 0 }, +#endif { -1, N_ARPSTAT, 1, NULL, arp_stats, NULL, "arp", 1, 0 }, { -1, -1, 0, NULL, |
