Date: Wed, 7 Sep 2022 03:55:37 GMT From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: aa74cc6d6f99 - main - divert(4): do not depend on ipfw(4) Message-ID: <202209070355.2873tbt4069910@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=aa74cc6d6f995f3ede4969ae5e0a0329d02754b4 commit aa74cc6d6f995f3ede4969ae5e0a0329d02754b4 Author: Gleb Smirnoff <glebius@FreeBSD.org> AuthorDate: 2022-09-07 03:54:57 +0000 Commit: Gleb Smirnoff <glebius@FreeBSD.org> CommitDate: 2022-09-07 03:54:57 +0000 divert(4): do not depend on ipfw(4) 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. --- sys/conf/files | 2 +- sys/modules/Makefile | 3 +-- sys/netinet/ip_divert.c | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 1e3518fcfcb0..a0e969b59e5f 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -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 diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 0c5e14a5e4c5..68b3dfcac776 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -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 diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index aa0ffdb55530..dd76a1792325 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209070355.2873tbt4069910>