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

divert(4): do not depend on ipfw(4)

Browse Source 
Although originally socket was intended to use with ipfw(4) only, now
it also can be used with pf(4).  On a kernel without packet filters,
it still can be used to inject traffic.
This commit is contained in:
Gleb Smirnoff 2022-09-06 20:54:57 -07:00
parent 999c9fd733
commit aa74cc6d6f
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/conf/files
View File

@ -4333,7 +4333,7 @@ netinet/in_prot.c optional inet | inet6
netinet/in_proto.c optional inet | inet6
netinet/in_rmx.c optional inet
netinet/in_rss.c optional inet rss
netinet/ip_divert.c optional ipdivert ipfirewall
netinet/ip_divert.c optional ipdivert inet | ipdivert inet6
netinet/ip_ecn.c optional inet | inet6
netinet/ip_encap.c optional inet | inet6
netinet/ip_fastfwd.c optional inet

3
sys/modules/Makefile
View File

@ -170,7 +170,7 @@ SUBDIR= \
${_io} \
${_ioat} \
${_ipoib} \
${_ipdivert} \
ipdivert \
${_ipfilter} \
${_ipfw} \
ipfw_nat \
@ -465,7 +465,6 @@ _if_stf= if_stf
.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
_if_me= if_me
_ipdivert= ipdivert
_ipfw= ipfw
.if ${MK_INET6_SUPPORT} != "no" || defined(ALL_MODULES)
_ipfw_nat64= ipfw_nat64

1
sys/netinet/ip_divert.c
View File

@ -763,5 +763,4 @@ static moduledata_t ipdivertmod = {
};
DECLARE_MODULE(ipdivert, ipdivertmod, SI_SUB_PROTO_FIREWALL, SI_ORDER_ANY);
MODULE_DEPEND(ipdivert, ipfw, 3, 3, 3);
MODULE_VERSION(ipdivert, 1);