From nobody Mon Dec 20 14:17:32 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8E220190109C; Mon, 20 Dec 2021 14:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JHhW10F7sz3KsW; Mon, 20 Dec 2021 14:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D34E1173F8; Mon, 20 Dec 2021 14:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BKEHWO8057723; Mon, 20 Dec 2021 14:17:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BKEHW2G057722; Mon, 20 Dec 2021 14:17:32 GMT (envelope-from git) Date: Mon, 20 Dec 2021 14:17:32 GMT Message-Id: <202112201417.1BKEHW2G057722@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 3b9b51fe464e - main - ipfilter: Move kernel bits to netpfil List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b9b51fe464ebb91e894742a6a0e6417e256f03a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640009853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ox7x0zvxE6xaBC0JP4DhKbSdw+eGNbFd80BeydAeFpM=; b=ViT1Rad0F0NR+qiNhoIb6yt/t+u3qL3mU/ny4zifud3hK+z2VpRFiD9NVs4xrvpPM8B7yJ cXJC0iZ7TM4fOoc3p3PoCgSDHTVikUXArWzd1hpvIijKzre5nH/Xgfe8N6nRWht04ACJgO +Eq5CP0+gtEB2/kCOOw/ltP6VJeBGcGdyp/YLsS0g1R0ry7RySRpmajeN9ApGofhLVcTwY QFPOD8pPdMs7gyYDmzzU7DLPSfLzsPGjev3ckhEyrKVPbC2lrlcrfjtx+8+kCexmOhtEaf OdGGb31li1S0DiGPDGicPvVKS5KexYEGtH91MR58hRGvFnIcpEAMcB/RwQ2oaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640009853; a=rsa-sha256; cv=none; b=tT/P4fhGBwyaFhDXdo928uBVIyYy9hsRog4GWkR8GGZ+p6opIp1OQ1E8BoceV6loU0K0Dd 6/rIVmZA6dnl9C7KJ+Y0ywVGfHC0my/kNqy3E41fCUIK9kWVQNEQV2kRXZdMLa6n64lxb5 kNOaOp23aDOtdI2IfzjW5tedpCmXZInsYUXZY6+wgWLEhRiW1YR9w40GPjRSLZidli6UBA eNKNigO3Uvl5dpua0pJpZgzBo/nEYJiEBkoVP7efmdIXah++h7/Ype2rLy0XnAvxp6+/45 CmpjFfoiph5JYLrsW96dV0oV4xb5WK+ywsjj6E1LS2blGOMHC49VPShnTZd2nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=3b9b51fe464ebb91e894742a6a0e6417e256f03a commit 3b9b51fe464ebb91e894742a6a0e6417e256f03a Author: Cy Schubert AuthorDate: 2021-12-15 16:28:18 +0000 Commit: Cy Schubert CommitDate: 2021-12-20 14:16:33 +0000 ipfilter: Move kernel bits to netpfil Through fixes and improvements our ipfilter sources have diverged enough to warrant move from contrib into sys/netpil. Now that I'm planning on implementing MSS clamping as in iptables it makes more sense to move ipfilter to netpfil. This is the first of three commits the ipfilter move. Suggested by glebius on two occaions. Suggested by and discussed with: glebius Reviewed by: glebius, kp (for #network) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D33510 --- include/Makefile | 4 +- sbin/ipf/Makefile.inc | 2 +- sbin/ipf/ipftest/Makefile | 2 +- sys/conf/files | 72 +++++++++++----------- sys/modules/ipfilter/Makefile | 4 +- .../ipfilter/netinet/IPFILTER.LICENCE | 0 sys/{contrib => netpfil}/ipfilter/netinet/fil.c | 0 .../ipfilter/netinet/ip_auth.c | 0 .../ipfilter/netinet/ip_auth.h | 0 .../ipfilter/netinet/ip_compat.h | 0 .../ipfilter/netinet/ip_dns_pxy.c | 0 .../ipfilter/netinet/ip_dstlist.c | 0 .../ipfilter/netinet/ip_dstlist.h | 0 sys/{contrib => netpfil}/ipfilter/netinet/ip_fil.h | 0 .../ipfilter/netinet/ip_fil_freebsd.c | 0 .../ipfilter/netinet/ip_frag.c | 0 .../ipfilter/netinet/ip_frag.h | 0 .../ipfilter/netinet/ip_ftp_pxy.c | 0 .../ipfilter/netinet/ip_htable.c | 0 .../ipfilter/netinet/ip_htable.h | 0 .../ipfilter/netinet/ip_ipsec_pxy.c | 0 .../ipfilter/netinet/ip_irc_pxy.c | 0 sys/{contrib => netpfil}/ipfilter/netinet/ip_log.c | 0 .../ipfilter/netinet/ip_lookup.c | 0 .../ipfilter/netinet/ip_lookup.h | 0 sys/{contrib => netpfil}/ipfilter/netinet/ip_nat.c | 0 sys/{contrib => netpfil}/ipfilter/netinet/ip_nat.h | 0 .../ipfilter/netinet/ip_nat6.c | 0 .../ipfilter/netinet/ip_netbios_pxy.c | 0 .../ipfilter/netinet/ip_pool.c | 0 .../ipfilter/netinet/ip_pool.h | 0 .../ipfilter/netinet/ip_pptp_pxy.c | 0 .../ipfilter/netinet/ip_proxy.c | 0 .../ipfilter/netinet/ip_proxy.h | 0 .../ipfilter/netinet/ip_raudio_pxy.c | 0 .../ipfilter/netinet/ip_rcmd_pxy.c | 0 .../ipfilter/netinet/ip_rpcb_pxy.c | 0 .../ipfilter/netinet/ip_rules.c | 0 .../ipfilter/netinet/ip_rules.h | 0 .../ipfilter/netinet/ip_scan.c | 0 .../ipfilter/netinet/ip_scan.h | 0 .../ipfilter/netinet/ip_state.c | 0 .../ipfilter/netinet/ip_state.h | 0 .../ipfilter/netinet/ip_sync.c | 0 .../ipfilter/netinet/ip_sync.h | 0 .../ipfilter/netinet/ip_tftp_pxy.c | 0 sys/{contrib => netpfil}/ipfilter/netinet/ipf_rb.h | 0 sys/{contrib => netpfil}/ipfilter/netinet/ipl.h | 0 .../ipfilter/netinet/mlfk_ipl.c | 0 .../ipfilter/netinet/radix_ipf.c | 0 .../ipfilter/netinet/radix_ipf.h | 0 51 files changed, 42 insertions(+), 42 deletions(-) diff --git a/include/Makefile b/include/Makefile index 1d6557cdad1e..76f713daf62c 100644 --- a/include/Makefile +++ b/include/Makefile @@ -177,7 +177,7 @@ PCIDIR= ${INCLUDEDIR}/dev/pci VERIEXEC= veriexec_ioctl.h VERIEXECDIR= ${INCLUDEDIR}/dev/veriexec -.PATH: ${SRCTOP}/sys/contrib/ipfilter/netinet +.PATH: ${SRCTOP}/sys/netpfil/ipfilter/netinet IPFILTER= ip_auth.h \ ip_compat.h \ ip_dstlist.h \ @@ -408,7 +408,7 @@ symlinks: .PHONY .META .endfor .if ${MK_IPFILTER} != "no" cd ${SRCTOP}; ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} \ - $$(printf '../../../%s ' sys/contrib/ipfilter/netinet/*.h) \ + $$(printf '../../../%s ' sys/netpfil/ipfilter/netinet/*.h) \ ${SDESTDIR}${INCLUDEDIR}/netinet; .endif .if ${MK_PF} != "no" diff --git a/sbin/ipf/Makefile.inc b/sbin/ipf/Makefile.inc index a38edf3481db..19742d3bd7c8 100644 --- a/sbin/ipf/Makefile.inc +++ b/sbin/ipf/Makefile.inc @@ -9,7 +9,7 @@ NO_WARRAY_BOUNDS= CFLAGS+= -I${SRCTOP}/contrib/ipfilter CFLAGS+= -I${SRCTOP}/contrib/ipfilter/tools CFLAGS+= -I${SRCTOP}/sys -CFLAGS+= -I${SRCTOP}/sys/contrib/ipfilter +CFLAGS+= -I${SRCTOP}/sys/netpfil/ipfilter CFLAGS+= -DSTATETOP -D__UIO_EXPOSE .if ${MK_INET6_SUPPORT} != "no" diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile index cefefdb0cf0f..f774c3197978 100644 --- a/sbin/ipf/ipftest/Makefile +++ b/sbin/ipf/ipftest/Makefile @@ -20,7 +20,7 @@ CFLAGS+= -DIPFILTER_LOG -DIPFILTER_COMPILED -DIPFILTER_LOOKUP \ # XXX CFLAGS+= -DIPFILTER_SCAN -.PATH: ${SRCTOP}/sys/contrib/ipfilter/netinet +.PATH: ${SRCTOP}/sys/netpfil/ipfilter/netinet GENHDRS= ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h diff --git a/sys/conf/files b/sys/conf/files index a3f7c0928214..517168b5a5d5 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -576,42 +576,42 @@ contrib/dev/acpica/components/utilities/utxface.c optional acpi contrib/dev/acpica/components/utilities/utxferror.c optional acpi contrib/dev/acpica/components/utilities/utxfinit.c optional acpi contrib/dev/acpica/os_specific/service_layers/osgendbg.c optional acpi acpi_debug -contrib/ipfilter/netinet/fil.c optional ipfilter inet \ - compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \ - compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet \ - compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/ip_frag.c optional ipfilter inet \ - compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/ip_log.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/ip_nat.c optional ipfilter inet \ - compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet \ - compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/ip_state.c optional ipfilter inet \ - compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/ip_lookup.c optional ipfilter inet \ - compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -Wno-error -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/ip_pool.c optional ipfilter inet \ - compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/ip_htable.c optional ipfilter inet \ - compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter ${NO_WTAUTOLOGICAL_POINTER_COMPARE}" -contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet \ - compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/ip_nat6.c optional ipfilter inet \ - compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/ip_rules.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/ip_scan.c optional ipfilter inet \ - compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/ip_dstlist.c optional ipfilter inet \ - compile-with "${NORMAL_C} -Wno-unused -I$S/contrib/ipfilter" -contrib/ipfilter/netinet/radix_ipf.c optional ipfilter inet \ - compile-with "${NORMAL_C} -I$S/contrib/ipfilter" +netpfil/ipfilter/netinet/fil.c optional ipfilter inet \ + compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/ip_auth.c optional ipfilter inet \ + compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet \ + compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/ip_frag.c optional ipfilter inet \ + compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/ip_log.c optional ipfilter inet \ + compile-with "${NORMAL_C} -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/ip_nat.c optional ipfilter inet \ + compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/ip_proxy.c optional ipfilter inet \ + compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/ip_state.c optional ipfilter inet \ + compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/ip_lookup.c optional ipfilter inet \ + compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -Wno-error -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/ip_pool.c optional ipfilter inet \ + compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/ip_htable.c optional ipfilter inet \ + compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter ${NO_WTAUTOLOGICAL_POINTER_COMPARE}" +netpfil/ipfilter/netinet/ip_sync.c optional ipfilter inet \ + compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet \ + compile-with "${NORMAL_C} -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/ip_nat6.c optional ipfilter inet \ + compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/ip_rules.c optional ipfilter inet \ + compile-with "${NORMAL_C} -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/ip_scan.c optional ipfilter inet \ + compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/ip_dstlist.c optional ipfilter inet \ + compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter" +netpfil/ipfilter/netinet/radix_ipf.c optional ipfilter inet \ + compile-with "${NORMAL_C} -I$S/netpfil/ipfilter" contrib/libfdt/fdt.c optional fdt contrib/libfdt/fdt_ro.c optional fdt contrib/libfdt/fdt_rw.c optional fdt diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile index 3c2ba2c74c08..acff092f3c14 100644 --- a/sys/modules/ipfilter/Makefile +++ b/sys/modules/ipfilter/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${SRCTOP}/sys/contrib/ipfilter/netinet +.PATH: ${SRCTOP}/sys/netpfil/ipfilter/netinet KMOD= ipl SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \ @@ -9,7 +9,7 @@ SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \ ip_nat6.c ip_rules.c ip_scan.c ip_dstlist.c radix_ipf.c SRCS+= opt_bpf.h opt_inet6.h opt_kern_tls.h -CFLAGS+= -I${SRCTOP}/sys/contrib/ipfilter +CFLAGS+= -I${SRCTOP}/sys/netpfil/ipfilter CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DIPFILTER_LOOKUP # # If you don't want log functionality remove -DIPFILTER_LOG diff --git a/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE b/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE similarity index 100% rename from sys/contrib/ipfilter/netinet/IPFILTER.LICENCE rename to sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c similarity index 100% rename from sys/contrib/ipfilter/netinet/fil.c rename to sys/netpfil/ipfilter/netinet/fil.c diff --git a/sys/contrib/ipfilter/netinet/ip_auth.c b/sys/netpfil/ipfilter/netinet/ip_auth.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_auth.c rename to sys/netpfil/ipfilter/netinet/ip_auth.c diff --git a/sys/contrib/ipfilter/netinet/ip_auth.h b/sys/netpfil/ipfilter/netinet/ip_auth.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_auth.h rename to sys/netpfil/ipfilter/netinet/ip_auth.h diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/netpfil/ipfilter/netinet/ip_compat.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_compat.h rename to sys/netpfil/ipfilter/netinet/ip_compat.h diff --git a/sys/contrib/ipfilter/netinet/ip_dns_pxy.c b/sys/netpfil/ipfilter/netinet/ip_dns_pxy.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_dns_pxy.c rename to sys/netpfil/ipfilter/netinet/ip_dns_pxy.c diff --git a/sys/contrib/ipfilter/netinet/ip_dstlist.c b/sys/netpfil/ipfilter/netinet/ip_dstlist.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_dstlist.c rename to sys/netpfil/ipfilter/netinet/ip_dstlist.c diff --git a/sys/contrib/ipfilter/netinet/ip_dstlist.h b/sys/netpfil/ipfilter/netinet/ip_dstlist.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_dstlist.h rename to sys/netpfil/ipfilter/netinet/ip_dstlist.h diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/sys/netpfil/ipfilter/netinet/ip_fil.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_fil.h rename to sys/netpfil/ipfilter/netinet/ip_fil.h diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_fil_freebsd.c rename to sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/sys/netpfil/ipfilter/netinet/ip_frag.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_frag.c rename to sys/netpfil/ipfilter/netinet/ip_frag.c diff --git a/sys/contrib/ipfilter/netinet/ip_frag.h b/sys/netpfil/ipfilter/netinet/ip_frag.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_frag.h rename to sys/netpfil/ipfilter/netinet/ip_frag.h diff --git a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c b/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_ftp_pxy.c rename to sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c diff --git a/sys/contrib/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_htable.c rename to sys/netpfil/ipfilter/netinet/ip_htable.c diff --git a/sys/contrib/ipfilter/netinet/ip_htable.h b/sys/netpfil/ipfilter/netinet/ip_htable.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_htable.h rename to sys/netpfil/ipfilter/netinet/ip_htable.h diff --git a/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c b/sys/netpfil/ipfilter/netinet/ip_ipsec_pxy.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c rename to sys/netpfil/ipfilter/netinet/ip_ipsec_pxy.c diff --git a/sys/contrib/ipfilter/netinet/ip_irc_pxy.c b/sys/netpfil/ipfilter/netinet/ip_irc_pxy.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_irc_pxy.c rename to sys/netpfil/ipfilter/netinet/ip_irc_pxy.c diff --git a/sys/contrib/ipfilter/netinet/ip_log.c b/sys/netpfil/ipfilter/netinet/ip_log.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_log.c rename to sys/netpfil/ipfilter/netinet/ip_log.c diff --git a/sys/contrib/ipfilter/netinet/ip_lookup.c b/sys/netpfil/ipfilter/netinet/ip_lookup.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_lookup.c rename to sys/netpfil/ipfilter/netinet/ip_lookup.c diff --git a/sys/contrib/ipfilter/netinet/ip_lookup.h b/sys/netpfil/ipfilter/netinet/ip_lookup.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_lookup.h rename to sys/netpfil/ipfilter/netinet/ip_lookup.h diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/netpfil/ipfilter/netinet/ip_nat.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_nat.c rename to sys/netpfil/ipfilter/netinet/ip_nat.c diff --git a/sys/contrib/ipfilter/netinet/ip_nat.h b/sys/netpfil/ipfilter/netinet/ip_nat.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_nat.h rename to sys/netpfil/ipfilter/netinet/ip_nat.h diff --git a/sys/contrib/ipfilter/netinet/ip_nat6.c b/sys/netpfil/ipfilter/netinet/ip_nat6.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_nat6.c rename to sys/netpfil/ipfilter/netinet/ip_nat6.c diff --git a/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c b/sys/netpfil/ipfilter/netinet/ip_netbios_pxy.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_netbios_pxy.c rename to sys/netpfil/ipfilter/netinet/ip_netbios_pxy.c diff --git a/sys/contrib/ipfilter/netinet/ip_pool.c b/sys/netpfil/ipfilter/netinet/ip_pool.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_pool.c rename to sys/netpfil/ipfilter/netinet/ip_pool.c diff --git a/sys/contrib/ipfilter/netinet/ip_pool.h b/sys/netpfil/ipfilter/netinet/ip_pool.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_pool.h rename to sys/netpfil/ipfilter/netinet/ip_pool.h diff --git a/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c b/sys/netpfil/ipfilter/netinet/ip_pptp_pxy.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_pptp_pxy.c rename to sys/netpfil/ipfilter/netinet/ip_pptp_pxy.c diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/netpfil/ipfilter/netinet/ip_proxy.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_proxy.c rename to sys/netpfil/ipfilter/netinet/ip_proxy.c diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.h b/sys/netpfil/ipfilter/netinet/ip_proxy.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_proxy.h rename to sys/netpfil/ipfilter/netinet/ip_proxy.h diff --git a/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c b/sys/netpfil/ipfilter/netinet/ip_raudio_pxy.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_raudio_pxy.c rename to sys/netpfil/ipfilter/netinet/ip_raudio_pxy.c diff --git a/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c b/sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c rename to sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c diff --git a/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c b/sys/netpfil/ipfilter/netinet/ip_rpcb_pxy.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c rename to sys/netpfil/ipfilter/netinet/ip_rpcb_pxy.c diff --git a/sys/contrib/ipfilter/netinet/ip_rules.c b/sys/netpfil/ipfilter/netinet/ip_rules.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_rules.c rename to sys/netpfil/ipfilter/netinet/ip_rules.c diff --git a/sys/contrib/ipfilter/netinet/ip_rules.h b/sys/netpfil/ipfilter/netinet/ip_rules.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_rules.h rename to sys/netpfil/ipfilter/netinet/ip_rules.h diff --git a/sys/contrib/ipfilter/netinet/ip_scan.c b/sys/netpfil/ipfilter/netinet/ip_scan.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_scan.c rename to sys/netpfil/ipfilter/netinet/ip_scan.c diff --git a/sys/contrib/ipfilter/netinet/ip_scan.h b/sys/netpfil/ipfilter/netinet/ip_scan.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_scan.h rename to sys/netpfil/ipfilter/netinet/ip_scan.h diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/sys/netpfil/ipfilter/netinet/ip_state.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_state.c rename to sys/netpfil/ipfilter/netinet/ip_state.c diff --git a/sys/contrib/ipfilter/netinet/ip_state.h b/sys/netpfil/ipfilter/netinet/ip_state.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_state.h rename to sys/netpfil/ipfilter/netinet/ip_state.h diff --git a/sys/contrib/ipfilter/netinet/ip_sync.c b/sys/netpfil/ipfilter/netinet/ip_sync.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_sync.c rename to sys/netpfil/ipfilter/netinet/ip_sync.c diff --git a/sys/contrib/ipfilter/netinet/ip_sync.h b/sys/netpfil/ipfilter/netinet/ip_sync.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_sync.h rename to sys/netpfil/ipfilter/netinet/ip_sync.h diff --git a/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c b/sys/netpfil/ipfilter/netinet/ip_tftp_pxy.c similarity index 100% rename from sys/contrib/ipfilter/netinet/ip_tftp_pxy.c rename to sys/netpfil/ipfilter/netinet/ip_tftp_pxy.c diff --git a/sys/contrib/ipfilter/netinet/ipf_rb.h b/sys/netpfil/ipfilter/netinet/ipf_rb.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ipf_rb.h rename to sys/netpfil/ipfilter/netinet/ipf_rb.h diff --git a/sys/contrib/ipfilter/netinet/ipl.h b/sys/netpfil/ipfilter/netinet/ipl.h similarity index 100% rename from sys/contrib/ipfilter/netinet/ipl.h rename to sys/netpfil/ipfilter/netinet/ipl.h diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c similarity index 100% rename from sys/contrib/ipfilter/netinet/mlfk_ipl.c rename to sys/netpfil/ipfilter/netinet/mlfk_ipl.c diff --git a/sys/contrib/ipfilter/netinet/radix_ipf.c b/sys/netpfil/ipfilter/netinet/radix_ipf.c similarity index 100% rename from sys/contrib/ipfilter/netinet/radix_ipf.c rename to sys/netpfil/ipfilter/netinet/radix_ipf.c diff --git a/sys/contrib/ipfilter/netinet/radix_ipf.h b/sys/netpfil/ipfilter/netinet/radix_ipf.h similarity index 100% rename from sys/contrib/ipfilter/netinet/radix_ipf.h rename to sys/netpfil/ipfilter/netinet/radix_ipf.h