diff options
author | bz <bz@FreeBSD.org> | 2011-06-28 11:57:25 +0000 |
---|---|---|
committer | bz <bz@FreeBSD.org> | 2011-06-28 11:57:25 +0000 |
commit | e15f804c7b67f7cac4a68d0f6b6d0418e9f7309a (patch) | |
tree | 6f90e30d66bc1d86e242d960993589e5a0ad8936 /sys/modules | |
parent | a963cb97121e4c58292b7deaf2a9d08d4455b21b (diff) | |
download | FreeBSD-src-e15f804c7b67f7cac4a68d0f6b6d0418e9f7309a.zip FreeBSD-src-e15f804c7b67f7cac4a68d0f6b6d0418e9f7309a.tar.gz |
Update packet filter (pf) code to OpenBSD 4.5.
You need to update userland (world and ports) tools
to be in sync with the kernel.
Submitted by: mlaier
Submitted by: eri
Diffstat (limited to 'sys/modules')
-rw-r--r-- | sys/modules/Makefile | 4 | ||||
-rw-r--r-- | sys/modules/pf/Makefile | 16 | ||||
-rw-r--r-- | sys/modules/pflog/Makefile | 18 | ||||
-rw-r--r-- | sys/modules/pfsync/Makefile | 38 |
4 files changed, 70 insertions, 6 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 2dbc3d9..ab27a31 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -241,6 +241,7 @@ SUBDIR= ${_3dfx} \ pcn \ ${_pf} \ ${_pflog} \ + ${_pfsync} \ plip \ ${_pmc} \ portalfs \ @@ -382,6 +383,9 @@ _netgraph= netgraph ${MK_INET6_SUPPORT} != "no")) || defined(ALL_MODULES) _pf= pf _pflog= pflog +.if ${MK_INET_SUPPORT} != "no" +_pfsync= pfsync +.endif .endif .if ${MACHINE_CPUARCH} == "i386" diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile index 78aa564..d4b01da 100644 --- a/sys/modules/pf/Makefile +++ b/sys/modules/pf/Makefile @@ -6,16 +6,18 @@ .PATH: ${.CURDIR}/../../contrib/pf/netinet KMOD= pf -SRCS = pf.c pf_if.c pf_subr.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \ +SRCS= pf.c pf_if.c pf_lb.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \ pf_ruleset.c \ in4_cksum.c \ - opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h + opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_global.h -CFLAGS+= -I${.CURDIR}/../../contrib/pf +CFLAGS+= -I${.CURDIR}/../../contrib/pf .if !defined(KERNBUILDDIR) +.if ${MK_INET_SUPPORT} != "no" opt_inet.h: echo "#define INET 1" > ${.TARGET} +.endif .if ${MK_INET6_SUPPORT} != "no" opt_inet6.h: @@ -26,9 +28,17 @@ opt_bpf.h: echo "#define DEV_BPF 1" > ${.TARGET} # pflog can be loaded as a module, have the additional checks turned on +# pfsync can be loaded as a module, have the additional checks turned on opt_pf.h: echo "#define DEV_PF 1" > ${.TARGET} echo "#define DEV_PFLOG 1" >> ${.TARGET} + echo "#define DEV_PFSYNC 1" >> ${.TARGET} + echo "#define DEV_PFLOW 1" >> ${.TARGET} + +.if defined(VIMAGE) +opt_global.h: + echo "#define VIMAGE 1" >> ${.TARGET} +.endif .endif .include <bsd.kmod.mk> diff --git a/sys/modules/pflog/Makefile b/sys/modules/pflog/Makefile index 2dbbd6c..0e8339e 100644 --- a/sys/modules/pflog/Makefile +++ b/sys/modules/pflog/Makefile @@ -5,14 +5,19 @@ .PATH: ${.CURDIR}/../../contrib/pf/net KMOD= pflog -SRCS = if_pflog.c \ +SRCS= if_pflog.c \ opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h -CFLAGS+= -I${.CURDIR}/../../contrib/pf +CFLAGS+= -I${.CURDIR}/../../contrib/pf +SRCS+= bus_if.h device_if.h -.if !defined(KERNBUILDDIR) +.if defined(KERNBUILDDIR) +MKDEP+= -include ${KERNBUILDDIR}/opt_global.h +.else +.if ${MK_INET_SUPPORT} != "no" opt_inet.h: echo "#define INET 1" > ${.TARGET} +.endif .if ${MK_INET6_SUPPORT} != "no" opt_inet6.h: @@ -21,6 +26,13 @@ opt_inet6.h: opt_bpf.h: echo "#define DEV_BPF 1" > ${.TARGET} + +.if defined(VIMAGE) +opt_global.h: + echo "#define VIMAGE 1" >> ${.TARGET} +CFLAGS+= -include opt_global.h +MKDEP+= -include opt_global.h +.endif .endif .include <bsd.kmod.mk> diff --git a/sys/modules/pfsync/Makefile b/sys/modules/pfsync/Makefile new file mode 100644 index 0000000..ad08b45 --- /dev/null +++ b/sys/modules/pfsync/Makefile @@ -0,0 +1,38 @@ +# $FreeBSD$ + +.include <bsd.own.mk> + +.PATH: ${.CURDIR}/../../contrib/pf/net + +KMOD= pfsync +SRCS= if_pfsync.c \ + opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h + +CFLAGS+= -I${.CURDIR}/../../contrib/pf +SRCS+= bus_if.h device_if.h + +.if defined(KERNBUILDDIR) +MKDEP+= -include ${KERNBUILDDIR}/opt_global.h +.else +.if ${MK_INET_SUPPORT} != "no" +opt_inet.h: + echo "#define INET 1" > ${.TARGET} +.endif + +.if ${MK_INET6_SUPPORT} != "no" +opt_inet6.h: + echo "#define INET6 1" > ${.TARGET} +.endif + +opt_bpf.h: + echo "#define DEV_BPF 1" > ${.TARGET} + +.if defined(VIMAGE) +opt_global.h: + echo "#define VIMAGE 1" >> ${.TARGET} +CFLAGS+= -include opt_global.h +MKDEP+= -include opt_global.h +.endif +.endif + +.include <bsd.kmod.mk> |