Prepare for pf 3.5 import:
- Remove pflog and pfsync modules. Things will change in such a fashion that there will be one module with pf+pflog that can be loaded into GENERIC without problems (which is what most people want). pfsync is no longer possible as a module. - Add multicast address for in-kernel multicast pfsync protocol. Protocol glue will follow once the import is done. - Add one more mbuf tag
This commit is contained in:
parent
914de73d8c
commit
a306c902b8
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=130609
@ -159,8 +159,6 @@ SUBDIR= ${_3dfx} \
|
||||
pcn \
|
||||
${_pecoff} \
|
||||
${_pf} \
|
||||
${_pflog} \
|
||||
${_pfsync} \
|
||||
plip \
|
||||
${_pmc} \
|
||||
portalfs \
|
||||
@ -273,8 +271,6 @@ _ipfilter= ipfilter
|
||||
|
||||
.if !defined(NO_PF) || defined(ALL_MODULES)
|
||||
_pf= pf
|
||||
_pflog= pflog
|
||||
_pfsync= pfsync
|
||||
.endif
|
||||
|
||||
.if ${MACHINE_ARCH} == "i386"
|
||||
|
@ -1,29 +0,0 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.PATH: ${.CURDIR}/../../contrib/pf/net
|
||||
|
||||
KMOD= pflog
|
||||
SRCS = if_pflog.c \
|
||||
opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h
|
||||
|
||||
CFLAGS+= -Wall -I${.CURDIR}/../../contrib/pf
|
||||
|
||||
opt_pf.h:
|
||||
echo "#define DEV_PF 1" > opt_pf.h
|
||||
echo "#define DEV_PFLOG 1" >> opt_pf.h
|
||||
echo "#define DEV_PFSYNC 1" >> opt_pf.h
|
||||
|
||||
opt_inet.h:
|
||||
echo "#define INET 1" > opt_inet.h
|
||||
|
||||
opt_inet6.h:
|
||||
.if defined(NOINET6)
|
||||
echo > opt_inet6.h
|
||||
.else
|
||||
echo "#define INET6 1" > opt_inet6.h
|
||||
.endif
|
||||
|
||||
opt_bpf.h:
|
||||
echo "#define DEV_BPF 1" > opt_bpf.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
@ -1,29 +0,0 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.PATH: ${.CURDIR}/../../contrib/pf/net
|
||||
|
||||
KMOD= pfsync
|
||||
SRCS = if_pfsync.c \
|
||||
opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h
|
||||
|
||||
CFLAGS+= -Wall -I${.CURDIR}/../../contrib/pf
|
||||
|
||||
opt_pf.h:
|
||||
echo "#define DEV_PF 1" > opt_pf.h
|
||||
echo "#define DEV_PFLOG 1" >> opt_pf.h
|
||||
echo "#define DEV_PFSYNC 1" >> opt_pf.h
|
||||
|
||||
opt_inet.h:
|
||||
echo "#define INET 1" > opt_inet.h
|
||||
|
||||
opt_inet6.h:
|
||||
.if defined(NOINET6)
|
||||
echo > opt_inet6.h
|
||||
.else
|
||||
echo "#define INET6 1" > opt_inet6.h
|
||||
.endif
|
||||
|
||||
opt_bpf.h:
|
||||
echo "#define DEV_BPF 1" > opt_bpf.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
@ -231,6 +231,7 @@ __END_DECLS
|
||||
/* 101-254: Partly Unassigned */
|
||||
#define IPPROTO_PIM 103 /* Protocol Independent Mcast */
|
||||
#define IPPROTO_PGM 113 /* PGM */
|
||||
#define IPPROTO_PFSYNC 240 /* PFSYNC */
|
||||
/* 255: Reserved */
|
||||
/* BSD Private, local use, namespace incursion, no longer used */
|
||||
#define IPPROTO_OLD_DIVERT 254 /* OLD divert pseudo-proto */
|
||||
@ -350,6 +351,7 @@ __END_DECLS
|
||||
#define INADDR_UNSPEC_GROUP (u_int32_t)0xe0000000 /* 224.0.0.0 */
|
||||
#define INADDR_ALLHOSTS_GROUP (u_int32_t)0xe0000001 /* 224.0.0.1 */
|
||||
#define INADDR_ALLRTRS_GROUP (u_int32_t)0xe0000002 /* 224.0.0.2 */
|
||||
#define INADDR_PFSYNC_GROUP (u_int32_t)0xe00000f0 /* 224.0.0.240 */
|
||||
#define INADDR_ALLMDNS_GROUP (u_int32_t)0xe00000fb /* 224.0.0.251 */
|
||||
#define INADDR_MAX_LOCAL_GROUP (u_int32_t)0xe00000ff /* 224.0.0.255 */
|
||||
|
||||
|
@ -632,6 +632,7 @@ struct mbuf *m_uiotombuf(struct uio *, int, int);
|
||||
#define PACKET_TAG_PF_QID 23 /* PF ALTQ queue id */
|
||||
#define PACKET_TAG_PF_TAG 24 /* PF tagged */
|
||||
#define PACKET_TAG_RTSOCKFAM 25 /* rtsock sa family */
|
||||
#define PACKET_TAG_PF_TRANSLATE_LOCALHOST 26 /* PF translate localhost */
|
||||
|
||||
/* Packet tag routines. */
|
||||
struct m_tag *m_tag_alloc(u_int32_t, int, int, int);
|
||||
|
Loading…
Reference in New Issue
Block a user