d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move new pf includes to the pf directory. The pfvar.h remain

Browse Source 
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:
Gleb Smirnoff 2013-10-27 16:25:57 +00:00
parent c2a445910d
commit 75bf2db380
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=257215
18 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/libpcap/grammar.y
View File

@ -56,7 +56,7 @@ struct rtentry;
#include "gencode.h"
#ifdef HAVE_NET_PFVAR_H
#include <net/if.h>
#include <net/pf.h>
#include <netpfil/pf/pf.h>
#include <net/if_pflog.h>
#endif
#include "ieee80211.h"

4
etc/mtree/BSD.include.dist
View File

@ -289,6 +289,10 @@
sig
..
..
netpfil
pf
..
..
netsmb
..
nfs

7
include/Makefile
View File

@ -287,6 +287,13 @@ symlinks:
ln -fs ../../../sys/contrib/ipfilter/netinet/$$h \
${DESTDIR}${INCLUDEDIR}/netinet; \
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
cd ${.CURDIR}/../sys/crypto; \
for h in rijndael/rijndael.h; do \

6
sys/contrib/altq/altq/altq_cbq.c
View File

@ -57,9 +57,9 @@
#include <net/if_var.h>
#include <netinet/in.h>
#include <net/pf.h>
#include <net/pf_altq.h>
#include <net/pf_mtag.h>
#include <netpfil/pf/pf.h>
#include <netpfil/pf/pf_altq.h>
#include <netpfil/pf/pf_mtag.h>
#include <altq/altq.h>
#include <altq/altq_cbq.h>
#ifdef ALTQ3_COMPAT

6
sys/contrib/altq/altq/altq_hfsc.c
View File

@ -69,9 +69,9 @@
#include <net/if_var.h>
#include <netinet/in.h>
#include <net/pf.h>
#include <net/pf_altq.h>
#include <net/pf_mtag.h>
#include <netpfil/pf/pf.h>
#include <netpfil/pf/pf_altq.h>
#include <netpfil/pf/pf_mtag.h>
#include <altq/altq.h>
#include <altq/altq_hfsc.h>
#ifdef ALTQ3_COMPAT

6
sys/contrib/altq/altq/altq_priq.c
View File

@ -54,9 +54,9 @@
#include <net/if_var.h>
#include <netinet/in.h>
#include <net/pf.h>
#include <net/pf_altq.h>
#include <net/pf_mtag.h>
#include <netpfil/pf/pf.h>
#include <netpfil/pf/pf_altq.h>
#include <netpfil/pf/pf_mtag.h>
#include <altq/altq.h>
#ifdef ALTQ3_COMPAT
#include <altq/altq_conf.h>

6
sys/contrib/altq/altq/altq_red.c
View File

@ -95,9 +95,9 @@
#include <netinet/ip6.h>
#endif
#include <net/pf.h>
#include <net/pf_altq.h>
#include <net/pf_mtag.h>
#include <netpfil/pf/pf.h>
#include <netpfil/pf/pf_altq.h>
#include <netpfil/pf/pf_mtag.h>
#include <altq/altq.h>
#include <altq/altq_red.h>
#ifdef ALTQ3_COMPAT

4
sys/contrib/altq/altq/altq_rio.c
View File

@ -90,8 +90,8 @@
#include <netinet/ip6.h>
#endif
#include <net/pf.h>
#include <net/pf_altq.h>
#include <netpfil/pf/pf.h>
#include <netpfil/pf/pf_altq.h>
#include <altq/altq.h>
#include <altq/altq_cdnr.h>
#include <altq/altq_red.h>

4
sys/contrib/altq/altq/altq_subr.c
View File

@ -65,8 +65,8 @@
#include <netinet/tcp.h>
#include <netinet/udp.h>
#include <net/pf.h>
#include <net/pf_altq.h>
#include <netpfil/pf/pf.h>
#include <netpfil/pf/pf_altq.h>
#include <altq/altq.h>
#ifdef ALTQ3_COMPAT
#include <altq/altq_conf.h>

3
sys/net/if_ethersubr.c
View File

@ -63,10 +63,11 @@
#include <net/if_bridgevar.h>
#include <net/if_vlan_var.h>
#include <net/if_llatbl.h>
#include <net/pf_mtag.h>
#include <net/pfil.h>
#include <net/vnet.h>
#include <netpfil/pf/pf_mtag.h>
#if defined(INET) || defined(INET6)
#include <netinet/in.h>
#include <netinet/in_var.h>

6
sys/net/pfvar.h
View File

@ -41,9 +41,9 @@
#include <net/radix.h>
#include <netinet/in.h>
#include <net/pf.h>
#include <net/pf_altq.h>
#include <net/pf_mtag.h>
#include <netpfil/pf/pf.h>
#include <netpfil/pf/pf_altq.h>
#include <netpfil/pf/pf_mtag.h>
struct pf_addr {
union {

3
sys/netpfil/ipfw/ip_fw2.c
View File

@ -61,10 +61,11 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_var.h>
#include <net/route.h>
#include <net/pf_mtag.h>
#include <net/pfil.h>
#include <net/vnet.h>
#include <netpfil/pf/pf_mtag.h>
#include <netinet/in.h>
#include <netinet/in_var.h>
#include <netinet/in_pcb.h>

1
sys/netpfil/pf/pf.c
View File

@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
#include <net/vnet.h>
#include <net/pfvar.h>
#include <net/pf_mtag.h>
#include <net/if_pflog.h>
#include <net/if_pfsync.h>

0
sys/net/pf.h → sys/netpfil/pf/pf.h
View File

0
sys/net/pf_altq.h → sys/netpfil/pf/pf_altq.h
View File

1
sys/netpfil/pf/pf_lb.c
View File

@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
#include <net/vnet.h>
#include <net/pfvar.h>
#include <net/if_pflog.h>
#include <net/pf_mtag.h>
#define DPFPRINTF(n, x) if (V_pf_status.debug >= (n)) printf x

0
sys/net/pf_mtag.h → sys/netpfil/pf/pf_mtag.h
View File

1
sys/netpfil/pf/pf_norm.c
View File

@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/vnet.h>
#include <net/pfvar.h>
#include <net/pf_mtag.h>
#include <net/if_pflog.h>
#include <netinet/in.h>