diff options
author | ugen <ugen@FreeBSD.org> | 1995-01-12 13:06:32 +0000 |
---|---|---|
committer | ugen <ugen@FreeBSD.org> | 1995-01-12 13:06:32 +0000 |
commit | dd3cca2bda9d3ca703f747b3b0b0e7ba3826e268 (patch) | |
tree | e08a527d927cd2352bf9634b2b9f5675613a97fe /sys/netinet/ip_output.c | |
parent | fb7c07cbe772b3ba04eb95bdebe04e365f18d72f (diff) | |
download | FreeBSD-src-dd3cca2bda9d3ca703f747b3b0b0e7ba3826e268.zip FreeBSD-src-dd3cca2bda9d3ca703f747b3b0b0e7ba3826e268.tar.gz |
Actual firewall change.
1) Firewall is not subdivided on forwarding / blocking chains
anymore.Actually only one chain left-it was the blocking one.
2) LKM support.ip_fwdef.c is function pointers definition and
goes into kernel along with all INET stuff.
Diffstat (limited to 'sys/netinet/ip_output.c')
-rw-r--r-- | sys/netinet/ip_output.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index da1a29a..5d7537d 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * $Id: ip_output.c,v 1.10 1994/12/12 17:20:54 ugen Exp $ + * $Id: ip_output.c,v 1.11 1994/12/13 23:08:12 wollman Exp $ */ #include <sys/param.h> @@ -53,12 +53,7 @@ #include <netinet/in_var.h> #include <netinet/ip_var.h> -#ifdef IPFIREWALL #include <netinet/ip_fw.h> -#endif -#ifdef IPACCT -#include <netinet/ip_fw.h> -#endif #ifdef vax #include <machine/mtpr.h> @@ -417,7 +412,6 @@ sendorfree: done: if (ro == &iproute && (flags & IP_ROUTETOIF) == 0 && ro->ro_rt) RTFREE(ro->ro_rt); -#ifdef IPACCT /* * Count outgoing packet,here we count both our packets and * those we forward. @@ -426,8 +420,9 @@ done: * This is locally generated packet so it has not * incoming interface. */ - ip_acct_cnt(ip,NULL,ip_acct_chain,1); -#endif + if (ip_acct_cnt_ptr!=NULL) + (*ip_acct_cnt_ptr)(ip,NULL,ip_acct_chain,1); + return (error); bad: m_freem(m0); |