svn commit: r225518 - in head/sys: modules/ipfw netinet/ipfw
John Baldwin
jhb at FreeBSD.org
Mon Sep 12 21:09:57 UTC 2011
Author: jhb
Date: Mon Sep 12 21:09:56 2011
New Revision: 225518
URL: http://svn.freebsd.org/changeset/base/225518
Log:
Allow the ipfw.ko module built with a kernel to honor any IPFIREWALL_*
options defined in the kernel config. This more closely matches the
behavior of other modules which inherit configuration settings from the
kernel configuration during a kernel + modules build.
Reviewed by: luigi
Approved by: re (kib)
MFC after: 1 week
Modified:
head/sys/modules/ipfw/Makefile
head/sys/netinet/ipfw/ip_fw2.c
head/sys/netinet/ipfw/ip_fw_dynamic.c
head/sys/netinet/ipfw/ip_fw_log.c
head/sys/netinet/ipfw/ip_fw_pfil.c
head/sys/netinet/ipfw/ip_fw_sockopt.c
head/sys/netinet/ipfw/ip_fw_table.c
Modified: head/sys/modules/ipfw/Makefile
==============================================================================
--- head/sys/modules/ipfw/Makefile Mon Sep 12 20:57:22 2011 (r225517)
+++ head/sys/modules/ipfw/Makefile Mon Sep 12 21:09:56 2011 (r225518)
@@ -8,7 +8,7 @@ KMOD= ipfw
SRCS= ip_fw2.c ip_fw_pfil.c
SRCS+= ip_fw_dynamic.c ip_fw_log.c
SRCS+= ip_fw_sockopt.c ip_fw_table.c
-SRCS+= opt_inet6.h opt_ipsec.h
+SRCS+= opt_inet6.h opt_ipfw.h opt_ipsec.h
CFLAGS+= -DIPFIREWALL
CFLAGS+= -I${.CURDIR}/../../contrib/pf
Modified: head/sys/netinet/ipfw/ip_fw2.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw2.c Mon Sep 12 20:57:22 2011 (r225517)
+++ head/sys/netinet/ipfw/ip_fw2.c Mon Sep 12 21:09:56 2011 (r225518)
@@ -30,8 +30,8 @@ __FBSDID("$FreeBSD$");
* The FreeBSD IP packet firewall, main file
*/
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
+#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"
Modified: head/sys/netinet/ipfw/ip_fw_dynamic.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_dynamic.c Mon Sep 12 20:57:22 2011 (r225517)
+++ head/sys/netinet/ipfw/ip_fw_dynamic.c Mon Sep 12 21:09:56 2011 (r225518)
@@ -33,8 +33,8 @@ __FBSDID("$FreeBSD$");
* Dynamic rule support for ipfw
*/
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
+#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"
Modified: head/sys/netinet/ipfw/ip_fw_log.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_log.c Mon Sep 12 20:57:22 2011 (r225517)
+++ head/sys/netinet/ipfw/ip_fw_log.c Mon Sep 12 21:09:56 2011 (r225518)
@@ -30,8 +30,8 @@ __FBSDID("$FreeBSD$");
* Logging support for ipfw
*/
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
+#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"
Modified: head/sys/netinet/ipfw/ip_fw_pfil.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_pfil.c Mon Sep 12 20:57:22 2011 (r225517)
+++ head/sys/netinet/ipfw/ip_fw_pfil.c Mon Sep 12 21:09:56 2011 (r225518)
@@ -27,8 +27,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
+#if !defined(KLD_MODULE)
#include "opt_ipdn.h"
#include "opt_inet.h"
#ifndef INET
Modified: head/sys/netinet/ipfw/ip_fw_sockopt.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_sockopt.c Mon Sep 12 20:57:22 2011 (r225517)
+++ head/sys/netinet/ipfw/ip_fw_sockopt.c Mon Sep 12 21:09:56 2011 (r225518)
@@ -33,8 +33,8 @@ __FBSDID("$FreeBSD$");
* the upper half of the ipfw code.
*/
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
+#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"
Modified: head/sys/netinet/ipfw/ip_fw_table.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_table.c Mon Sep 12 20:57:22 2011 (r225517)
+++ head/sys/netinet/ipfw/ip_fw_table.c Mon Sep 12 21:09:56 2011 (r225518)
@@ -39,8 +39,8 @@ __FBSDID("$FreeBSD$");
* from userland, because operations are typically fast.
*/
-#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
+#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"
More information about the svn-src-head
mailing list