diff options
| author | glebius <glebius@FreeBSD.org> | 2014-03-12 10:45:58 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2014-03-12 10:45:58 +0000 |
| commit | f937dcf2bd0584087acec5d8dc92dd5dba177113 (patch) | |
| tree | 8cbef21f45f26a80647ff8a0604c3c9c65c2bb40 /contrib | |
| parent | eeff801556700aefbd569ad4bac5acdebcc3b9a8 (diff) | |
| download | FreeBSD-src-f937dcf2bd0584087acec5d8dc92dd5dba177113.zip FreeBSD-src-f937dcf2bd0584087acec5d8dc92dd5dba177113.tar.gz | |
Bulk sync of pf changes from head, in attempt to fixup broken build I
made in r263029.
Merge r257186,257215,257349,259736,261797.
These changesets split pfvar.h into several smaller headers and make
userland utilities to include only some of them.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libpcap/grammar.y | 2 | ||||
| -rw-r--r-- | contrib/tcpdump/print-ip.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/contrib/libpcap/grammar.y b/contrib/libpcap/grammar.y index ac69db9..12a326e 100644 --- a/contrib/libpcap/grammar.y +++ b/contrib/libpcap/grammar.y @@ -56,7 +56,7 @@ struct rtentry; #include "gencode.h" #ifdef HAVE_NET_PFVAR_H #include <net/if.h> -#include <net/pfvar.h> +#include <netpfil/pf/pf.h> #include <net/if_pflog.h> #endif #include "ieee80211.h" diff --git a/contrib/tcpdump/print-ip.c b/contrib/tcpdump/print-ip.c index bc6cbcc..291901f 100644 --- a/contrib/tcpdump/print-ip.c +++ b/contrib/tcpdump/print-ip.c @@ -483,9 +483,11 @@ again: pgm_print(ipds->cp, ipds->len, (const u_char *)ipds->ip); break; +#if defined(HAVE_NET_PFVAR_H) case IPPROTO_PFSYNC: pfsync_ip_print(ipds->cp, ipds->len); break; +#endif default: if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL) |
