diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2000-09-23 18:50:59 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2000-09-23 18:50:59 +0000 |
| commit | 20cb9f9efe4c084e62f89e006e4d7bb42eace34e (patch) | |
| tree | a6df1aee70fb5e463ac43059fc8bbe8fee737c80 /sys/netinet6/ip6_output.c | |
| parent | 1204fd85a4ea199414100949bbd5cbc0b96232fa (diff) | |
| download | src-20cb9f9efe4c084e62f89e006e4d7bb42eace34e.tar.gz src-20cb9f9efe4c084e62f89e006e4d7bb42eace34e.zip | |
Make ip6fw as loadable module.
Notes
Notes:
svn path=/head/; revision=66303
Diffstat (limited to 'sys/netinet6/ip6_output.c')
| -rw-r--r-- | sys/netinet6/ip6_output.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 64d1bb536d84..c17070ce711a 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -106,9 +106,7 @@ #include <net/net_osdep.h> -#ifdef IPV6FIREWALL #include <netinet6/ip6_fw.h> -#endif #include <netinet6/ip6protosw.h> @@ -803,11 +801,10 @@ skip_ipsec2:; ip6->ip6_dst.s6_addr16[1] = 0; } -#ifdef IPV6FIREWALL /* * Check with the firewall... */ - if (ip6_fw_chk_ptr) { + if (ip6_fw_enable && ip6_fw_chk_ptr) { u_short port = 0; m->m_pkthdr.rcvif = NULL; /*XXX*/ /* If ipfw says divert, we have to just drop packet */ @@ -820,7 +817,6 @@ skip_ipsec2:; goto done; } } -#endif /* * If the outgoing packet contains a hop-by-hop options header, @@ -1388,7 +1384,6 @@ ip6_ctloutput(so, sopt) break; #endif /* IPSEC */ -#ifdef IPV6FIREWALL case IPV6_FW_ADD: case IPV6_FW_DEL: case IPV6_FW_FLUSH: @@ -1409,7 +1404,6 @@ ip6_ctloutput(so, sopt) m = *mp; } break; -#endif default: error = ENOPROTOOPT; @@ -1543,7 +1537,6 @@ ip6_ctloutput(so, sopt) } #endif /* IPSEC */ -#ifdef IPV6FIREWALL case IPV6_FW_GET: { struct mbuf *m; @@ -1560,7 +1553,6 @@ ip6_ctloutput(so, sopt) m_freem(m); } break; -#endif default: error = ENOPROTOOPT; |