Move new pf includes to the pf directory. The pfvar.h remain
in net, to avoid compatibility breakage for no sake. The future plan is to split most of non-kernel parts of pfvar.h into pf.h, and then make pfvar.h a kernel only include breaking compatibility. Discussed with: bz
This commit is contained in:
parent
c2a445910d
commit
75bf2db380
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=257215
@ -56,7 +56,7 @@ struct rtentry;
|
|||||||
#include "gencode.h"
|
#include "gencode.h"
|
||||||
#ifdef HAVE_NET_PFVAR_H
|
#ifdef HAVE_NET_PFVAR_H
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <net/pf.h>
|
#include <netpfil/pf/pf.h>
|
||||||
#include <net/if_pflog.h>
|
#include <net/if_pflog.h>
|
||||||
#endif
|
#endif
|
||||||
#include "ieee80211.h"
|
#include "ieee80211.h"
|
||||||
|
@ -289,6 +289,10 @@
|
|||||||
sig
|
sig
|
||||||
..
|
..
|
||||||
..
|
..
|
||||||
|
netpfil
|
||||||
|
pf
|
||||||
|
..
|
||||||
|
..
|
||||||
netsmb
|
netsmb
|
||||||
..
|
..
|
||||||
nfs
|
nfs
|
||||||
|
@ -287,6 +287,13 @@ symlinks:
|
|||||||
ln -fs ../../../sys/contrib/ipfilter/netinet/$$h \
|
ln -fs ../../../sys/contrib/ipfilter/netinet/$$h \
|
||||||
${DESTDIR}${INCLUDEDIR}/netinet; \
|
${DESTDIR}${INCLUDEDIR}/netinet; \
|
||||||
done
|
done
|
||||||
|
.endif
|
||||||
|
.if ${MK_PF} != "no"
|
||||||
|
cd ${.CURDIR}/../sys/netpfil/pf; \
|
||||||
|
for h in *.h; do \
|
||||||
|
ln -fs ../../../../sys/netpfil/pf/$$h \
|
||||||
|
${DESTDIR}${INCLUDEDIR}/netpfil/pf; \
|
||||||
|
done
|
||||||
.endif
|
.endif
|
||||||
cd ${.CURDIR}/../sys/crypto; \
|
cd ${.CURDIR}/../sys/crypto; \
|
||||||
for h in rijndael/rijndael.h; do \
|
for h in rijndael/rijndael.h; do \
|
||||||
|
@ -57,9 +57,9 @@
|
|||||||
#include <net/if_var.h>
|
#include <net/if_var.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
#include <net/pf.h>
|
#include <netpfil/pf/pf.h>
|
||||||
#include <net/pf_altq.h>
|
#include <netpfil/pf/pf_altq.h>
|
||||||
#include <net/pf_mtag.h>
|
#include <netpfil/pf/pf_mtag.h>
|
||||||
#include <altq/altq.h>
|
#include <altq/altq.h>
|
||||||
#include <altq/altq_cbq.h>
|
#include <altq/altq_cbq.h>
|
||||||
#ifdef ALTQ3_COMPAT
|
#ifdef ALTQ3_COMPAT
|
||||||
|
@ -69,9 +69,9 @@
|
|||||||
#include <net/if_var.h>
|
#include <net/if_var.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
#include <net/pf.h>
|
#include <netpfil/pf/pf.h>
|
||||||
#include <net/pf_altq.h>
|
#include <netpfil/pf/pf_altq.h>
|
||||||
#include <net/pf_mtag.h>
|
#include <netpfil/pf/pf_mtag.h>
|
||||||
#include <altq/altq.h>
|
#include <altq/altq.h>
|
||||||
#include <altq/altq_hfsc.h>
|
#include <altq/altq_hfsc.h>
|
||||||
#ifdef ALTQ3_COMPAT
|
#ifdef ALTQ3_COMPAT
|
||||||
|
@ -54,9 +54,9 @@
|
|||||||
#include <net/if_var.h>
|
#include <net/if_var.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
#include <net/pf.h>
|
#include <netpfil/pf/pf.h>
|
||||||
#include <net/pf_altq.h>
|
#include <netpfil/pf/pf_altq.h>
|
||||||
#include <net/pf_mtag.h>
|
#include <netpfil/pf/pf_mtag.h>
|
||||||
#include <altq/altq.h>
|
#include <altq/altq.h>
|
||||||
#ifdef ALTQ3_COMPAT
|
#ifdef ALTQ3_COMPAT
|
||||||
#include <altq/altq_conf.h>
|
#include <altq/altq_conf.h>
|
||||||
|
@ -95,9 +95,9 @@
|
|||||||
#include <netinet/ip6.h>
|
#include <netinet/ip6.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <net/pf.h>
|
#include <netpfil/pf/pf.h>
|
||||||
#include <net/pf_altq.h>
|
#include <netpfil/pf/pf_altq.h>
|
||||||
#include <net/pf_mtag.h>
|
#include <netpfil/pf/pf_mtag.h>
|
||||||
#include <altq/altq.h>
|
#include <altq/altq.h>
|
||||||
#include <altq/altq_red.h>
|
#include <altq/altq_red.h>
|
||||||
#ifdef ALTQ3_COMPAT
|
#ifdef ALTQ3_COMPAT
|
||||||
|
@ -90,8 +90,8 @@
|
|||||||
#include <netinet/ip6.h>
|
#include <netinet/ip6.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <net/pf.h>
|
#include <netpfil/pf/pf.h>
|
||||||
#include <net/pf_altq.h>
|
#include <netpfil/pf/pf_altq.h>
|
||||||
#include <altq/altq.h>
|
#include <altq/altq.h>
|
||||||
#include <altq/altq_cdnr.h>
|
#include <altq/altq_cdnr.h>
|
||||||
#include <altq/altq_red.h>
|
#include <altq/altq_red.h>
|
||||||
|
@ -65,8 +65,8 @@
|
|||||||
#include <netinet/tcp.h>
|
#include <netinet/tcp.h>
|
||||||
#include <netinet/udp.h>
|
#include <netinet/udp.h>
|
||||||
|
|
||||||
#include <net/pf.h>
|
#include <netpfil/pf/pf.h>
|
||||||
#include <net/pf_altq.h>
|
#include <netpfil/pf/pf_altq.h>
|
||||||
#include <altq/altq.h>
|
#include <altq/altq.h>
|
||||||
#ifdef ALTQ3_COMPAT
|
#ifdef ALTQ3_COMPAT
|
||||||
#include <altq/altq_conf.h>
|
#include <altq/altq_conf.h>
|
||||||
|
@ -63,10 +63,11 @@
|
|||||||
#include <net/if_bridgevar.h>
|
#include <net/if_bridgevar.h>
|
||||||
#include <net/if_vlan_var.h>
|
#include <net/if_vlan_var.h>
|
||||||
#include <net/if_llatbl.h>
|
#include <net/if_llatbl.h>
|
||||||
#include <net/pf_mtag.h>
|
|
||||||
#include <net/pfil.h>
|
#include <net/pfil.h>
|
||||||
#include <net/vnet.h>
|
#include <net/vnet.h>
|
||||||
|
|
||||||
|
#include <netpfil/pf/pf_mtag.h>
|
||||||
|
|
||||||
#if defined(INET) || defined(INET6)
|
#if defined(INET) || defined(INET6)
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <netinet/in_var.h>
|
#include <netinet/in_var.h>
|
||||||
|
@ -41,9 +41,9 @@
|
|||||||
#include <net/radix.h>
|
#include <net/radix.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
#include <net/pf.h>
|
#include <netpfil/pf/pf.h>
|
||||||
#include <net/pf_altq.h>
|
#include <netpfil/pf/pf_altq.h>
|
||||||
#include <net/pf_mtag.h>
|
#include <netpfil/pf/pf_mtag.h>
|
||||||
|
|
||||||
struct pf_addr {
|
struct pf_addr {
|
||||||
union {
|
union {
|
||||||
|
@ -61,10 +61,11 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <net/if_var.h>
|
#include <net/if_var.h>
|
||||||
#include <net/route.h>
|
#include <net/route.h>
|
||||||
#include <net/pf_mtag.h>
|
|
||||||
#include <net/pfil.h>
|
#include <net/pfil.h>
|
||||||
#include <net/vnet.h>
|
#include <net/vnet.h>
|
||||||
|
|
||||||
|
#include <netpfil/pf/pf_mtag.h>
|
||||||
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <netinet/in_var.h>
|
#include <netinet/in_var.h>
|
||||||
#include <netinet/in_pcb.h>
|
#include <netinet/in_pcb.h>
|
||||||
|
@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include <net/vnet.h>
|
#include <net/vnet.h>
|
||||||
|
|
||||||
#include <net/pfvar.h>
|
#include <net/pfvar.h>
|
||||||
#include <net/pf_mtag.h>
|
|
||||||
#include <net/if_pflog.h>
|
#include <net/if_pflog.h>
|
||||||
#include <net/if_pfsync.h>
|
#include <net/if_pfsync.h>
|
||||||
|
|
||||||
|
@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include <net/vnet.h>
|
#include <net/vnet.h>
|
||||||
#include <net/pfvar.h>
|
#include <net/pfvar.h>
|
||||||
#include <net/if_pflog.h>
|
#include <net/if_pflog.h>
|
||||||
#include <net/pf_mtag.h>
|
|
||||||
|
|
||||||
#define DPFPRINTF(n, x) if (V_pf_status.debug >= (n)) printf x
|
#define DPFPRINTF(n, x) if (V_pf_status.debug >= (n)) printf x
|
||||||
|
|
||||||
|
@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <net/vnet.h>
|
#include <net/vnet.h>
|
||||||
#include <net/pfvar.h>
|
#include <net/pfvar.h>
|
||||||
#include <net/pf_mtag.h>
|
|
||||||
#include <net/if_pflog.h>
|
#include <net/if_pflog.h>
|
||||||
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user