From 908e960ea6343acd9515d89d5d5696f9d8bf090c Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Fri, 5 Jun 2009 19:22:47 +0000 Subject: [PATCH] move kernel ipfw-related sources to a separate directory, adjust conf/files and modules' Makefiles accordingly. No code or ABI changes so this and most of previous related changes can be easily MFC'ed MFC after: 5 days --- sys/conf/files | 8 ++++---- sys/modules/dummynet/Makefile | 2 +- sys/modules/ipfw/Makefile | 2 +- sys/modules/ipfw_nat/Makefile | 2 +- sys/netinet/{ => ipfw}/ip_dummynet.c | 0 sys/netinet/{ => ipfw}/ip_fw2.c | 0 sys/netinet/{ => ipfw}/ip_fw_nat.c | 0 sys/netinet/{ => ipfw}/ip_fw_pfil.c | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename sys/netinet/{ => ipfw}/ip_dummynet.c (100%) rename sys/netinet/{ => ipfw}/ip_fw2.c (100%) rename sys/netinet/{ => ipfw}/ip_fw_nat.c (100%) rename sys/netinet/{ => ipfw}/ip_fw_pfil.c (100%) diff --git a/sys/conf/files b/sys/conf/files index 903a9570889..b47ee0d064f 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2334,14 +2334,14 @@ netinet/in_proto.c optional inet \ compile-with "${NORMAL_C} -I$S/contrib/pf" netinet/in_rmx.c optional inet netinet/ip_divert.c optional ipdivert -netinet/ip_dummynet.c optional dummynet +netinet/ipfw/ip_dummynet.c optional dummynet netinet/ip_ecn.c optional inet | inet6 netinet/ip_encap.c optional inet | inet6 netinet/ip_fastfwd.c optional inet -netinet/ip_fw2.c optional ipfirewall \ +netinet/ipfw/ip_fw2.c optional ipfirewall \ compile-with "${NORMAL_C} -I$S/contrib/pf" -netinet/ip_fw_pfil.c optional ipfirewall -netinet/ip_fw_nat.c optional ipfirewall_nat +netinet/ipfw/ip_fw_pfil.c optional ipfirewall +netinet/ipfw/ip_fw_nat.c optional ipfirewall_nat netinet/ip_icmp.c optional inet netinet/ip_input.c optional inet netinet/ip_ipsec.c optional ipsec diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile index 5da69b271f5..c25a7a7b0f4 100644 --- a/sys/modules/dummynet/Makefile +++ b/sys/modules/dummynet/Makefile @@ -2,7 +2,7 @@ .include -.PATH: ${.CURDIR}/../../netinet +.PATH: ${.CURDIR}/../../netinet/ipfw KMOD= dummynet SRCS= ip_dummynet.c SRCS+= opt_inet6.h diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile index 8e40d4291fc..bc1bd08e58d 100644 --- a/sys/modules/ipfw/Makefile +++ b/sys/modules/ipfw/Makefile @@ -2,7 +2,7 @@ .include -.PATH: ${.CURDIR}/../../netinet +.PATH: ${.CURDIR}/../../netinet/ipfw KMOD= ipfw SRCS= ip_fw2.c ip_fw_pfil.c diff --git a/sys/modules/ipfw_nat/Makefile b/sys/modules/ipfw_nat/Makefile index 8d51124c4ec..1c957abe9f7 100644 --- a/sys/modules/ipfw_nat/Makefile +++ b/sys/modules/ipfw_nat/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netinet +.PATH: ${.CURDIR}/../../netinet/ipfw KMOD= ipfw_nat SRCS= ip_fw_nat.c diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ipfw/ip_dummynet.c similarity index 100% rename from sys/netinet/ip_dummynet.c rename to sys/netinet/ipfw/ip_dummynet.c diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ipfw/ip_fw2.c similarity index 100% rename from sys/netinet/ip_fw2.c rename to sys/netinet/ipfw/ip_fw2.c diff --git a/sys/netinet/ip_fw_nat.c b/sys/netinet/ipfw/ip_fw_nat.c similarity index 100% rename from sys/netinet/ip_fw_nat.c rename to sys/netinet/ipfw/ip_fw_nat.c diff --git a/sys/netinet/ip_fw_pfil.c b/sys/netinet/ipfw/ip_fw_pfil.c similarity index 100% rename from sys/netinet/ip_fw_pfil.c rename to sys/netinet/ipfw/ip_fw_pfil.c