git: 69ea7bffbe8e - stable/12 - ipfilter: Move kernel bits to netpfil

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Mon, 07 Feb 2022 13:55:48 UTC
The branch stable/12 has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=69ea7bffbe8e258aab127b2ae772c144695163e6

commit 69ea7bffbe8e258aab127b2ae772c144695163e6
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2021-12-15 16:28:18 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2022-02-07 13:55:10 +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)
    Differential Revision:          https://reviews.freebsd.org/D33510
    
    (cherry picked from commit 3b9b51fe464ebb91e894742a6a0e6417e256f03a)
---
 include/Makefile                                   |  6 +-
 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, 43 insertions(+), 43 deletions(-)

diff --git a/include/Makefile b/include/Makefile
index bd0ddc10b492..8cd916351e41 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -204,7 +204,7 @@ copies: .PHONY .META
 	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
 	    ${SDESTDIR}${INCLUDEDIR}/isofs/cd9660
 .if ${MK_IPFILTER} != "no"
-	cd ${SRCTOP}/sys/contrib/ipfilter/netinet; \
+	cd ${SRCTOP}/sys/netpfil/ipfilter/netinet; \
 	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
 	    ${SDESTDIR}${INCLUDEDIR}/netinet
 .endif
@@ -328,9 +328,9 @@ symlinks: .PHONY .META
 	done
 .endfor
 .if ${MK_IPFILTER} != "no"
-	cd ${SRCTOP}/sys/contrib/ipfilter/netinet; \
+	cd ${SRCTOP}/sys/netpfil/ipfilter/netinet; \
 	for h in *.h; do \
-		${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/contrib/ipfilter/netinet/$$h \
+		${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/netpfil/ipfilter/netinet/$$h \
 		    ${SDESTDIR}${INCLUDEDIR}/netinet; \
 	done
 .endif
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 a0838d0757c3..0b01ac08623e 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -541,42 +541,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 e8c8893bdf59..7aa8f7a84199 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
 
-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