diff options
author | bde <bde@FreeBSD.org> | 1996-06-23 14:28:02 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1996-06-23 14:28:02 +0000 |
commit | b2263f0583ea30044d4242034bf7739a5c0387ad (patch) | |
tree | b0a3839184e317f91e86c94bcf2a1ab59444dfaf | |
parent | 474d107d6d9d24ab922aab436eaa6ba33a5eca42 (diff) | |
download | FreeBSD-src-b2263f0583ea30044d4242034bf7739a5c0387ad.zip FreeBSD-src-b2263f0583ea30044d4242034bf7739a5c0387ad.tar.gz |
Use IPFIREWALL_MODULE instead of ACTUALLY_LKM_NOT_KERNEL to indicate
LKM'ness. ACTUALLY_LKM_NOT_KERNEL is supposed to be so ugly that it
only gets used until <machine/conf.h> goes away. bsd.kmod.mk should
define a better-named general macro for this. Some places use
PSEUDO_LKM. This is another bad name.
Makefile:
Added IPFIREWALL_VERBOSE_LIMIT option (commented out).
-rw-r--r-- | lkm/ipfw/Makefile | 5 | ||||
-rw-r--r-- | sys/modules/ipfw/Makefile | 5 | ||||
-rw-r--r-- | sys/netinet/ip_fw.c | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/lkm/ipfw/Makefile b/lkm/ipfw/Makefile index da140b9..bef7381 100644 --- a/lkm/ipfw/Makefile +++ b/lkm/ipfw/Makefile @@ -1,13 +1,14 @@ -# $Id: Makefile,v 1.3 1995/05/30 06:06:07 rgrimes Exp $ +# $Id: Makefile,v 1.4 1996/02/24 13:41:56 phk Exp $ .PATH: ${.CURDIR}/../../sys/netinet KMOD= ipfw_mod SRCS= ip_fw.c NOMAN= -CFLAGS+= -DIPFIREWALL +CFLAGS+= -DIPFIREWALL -DIPFIREWALL_MODULE # #If you want it verbose #CFLAGS+= -DIPFIREWALL_VERBOSE +#CFLAGS+= -DIPFIREWALL_VERBOSE_LIMIT=100 # .include <bsd.kmod.mk> diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile index da140b9..bef7381 100644 --- a/sys/modules/ipfw/Makefile +++ b/sys/modules/ipfw/Makefile @@ -1,13 +1,14 @@ -# $Id: Makefile,v 1.3 1995/05/30 06:06:07 rgrimes Exp $ +# $Id: Makefile,v 1.4 1996/02/24 13:41:56 phk Exp $ .PATH: ${.CURDIR}/../../sys/netinet KMOD= ipfw_mod SRCS= ip_fw.c NOMAN= -CFLAGS+= -DIPFIREWALL +CFLAGS+= -DIPFIREWALL -DIPFIREWALL_MODULE # #If you want it verbose #CFLAGS+= -DIPFIREWALL_VERBOSE +#CFLAGS+= -DIPFIREWALL_VERBOSE_LIMIT=100 # .include <bsd.kmod.mk> diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c index b9c754e..5cff936 100644 --- a/sys/netinet/ip_fw.c +++ b/sys/netinet/ip_fw.c @@ -12,14 +12,14 @@ * * This software is provided ``AS IS'' without any warranties of any kind. * - * $Id: ip_fw.c,v 1.39 1996/06/13 17:35:28 gpalmer Exp $ + * $Id: ip_fw.c,v 1.40 1996/06/17 00:00:35 alex Exp $ */ /* * Implement IP packet firewall */ -#ifndef ACTUALLY_LKM_NOT_KERNEL +#ifndef IPFIREWALL_MODULE #include "opt_ipfw.h" #endif @@ -82,7 +82,7 @@ static int tcpflg_match __P((struct tcphdr *tcp, struct ip_fw *f)); static int icmptype_match __P((struct icmp * icmp, struct ip_fw * f)); static void ipfw_report __P((char *txt, int rule, struct ip *ip, int counter)); -#ifdef ACTUALLY_LKM_NOT_KERNEL +#ifdef IPFIREWALL_MODULE static ip_fw_chk_t *old_chk_ptr; static ip_fw_ctl_t *old_ctl_ptr; #endif @@ -728,7 +728,7 @@ ip_fw_init(void) #endif } -#ifdef ACTUALLY_LKM_NOT_KERNEL +#ifdef IPFIREWALL_MODULE #include <sys/exec.h> #include <sys/sysent.h> |