diff options
author | mlaier <mlaier@FreeBSD.org> | 2006-05-12 20:39:23 +0000 |
---|---|---|
committer | mlaier <mlaier@FreeBSD.org> | 2006-05-12 20:39:23 +0000 |
commit | 123e91766b9a892556b2436bc59b9c6c5d6d8529 (patch) | |
tree | f4f22df7c476b68df1c6800d1b6306e9e02fa898 /sys/netinet6/ip6_output.c | |
parent | feb912d35980d6573e945f8726a0a1df9128ec2b (diff) | |
download | FreeBSD-src-123e91766b9a892556b2436bc59b9c6c5d6d8529.zip FreeBSD-src-123e91766b9a892556b2436bc59b9c6c5d6d8529.tar.gz |
Remove ip6fw. Since ipfw has full functional IPv6 support now and - in
contrast to ip6fw - is properly lockes, it is time to retire ip6fw.
Diffstat (limited to 'sys/netinet6/ip6_output.c')
-rw-r--r-- | sys/netinet6/ip6_output.c | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 57999f8..98f777a 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -61,7 +61,6 @@ * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 */ -#include "opt_ip6fw.h" #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" @@ -106,8 +105,6 @@ #include <netipsec/key.h> #endif /* FAST_IPSEC */ -#include <netinet6/ip6_fw.h> - #include <net/net_osdep.h> #include <netinet6/ip6protosw.h> @@ -839,23 +836,6 @@ again: in6_clearscope(&ip6->ip6_dst); /* - * Check with the firewall... - */ - 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 */ - if ((*ip6_fw_chk_ptr)(&ip6, ifp, &port, &m)) { - m_freem(m); - goto done; - } - if (!m) { - error = EACCES; - goto done; - } - } - - /* * If the outgoing packet contains a hop-by-hop options header, * it must be examined and processed even by the source node. * (RFC 2460, section 4.) @@ -1891,27 +1871,6 @@ do { \ break; #endif /* KAME IPSEC */ - case IPV6_FW_ADD: - case IPV6_FW_DEL: - case IPV6_FW_FLUSH: - case IPV6_FW_ZERO: - { - struct mbuf *m; - struct mbuf **mp = &m; - - if (ip6_fw_ctl_ptr == NULL) - return EINVAL; - /* XXX */ - if ((error = soopt_getm(sopt, &m)) != 0) - break; - /* XXX */ - if ((error = soopt_mcopyin(sopt, m)) != 0) - break; - error = (*ip6_fw_ctl_ptr)(optname, mp); - m = *mp; - } - break; - default: error = ENOPROTOOPT; break; @@ -2138,23 +2097,6 @@ do { \ } #endif /* KAME IPSEC */ - case IPV6_FW_GET: - { - struct mbuf *m; - struct mbuf **mp = &m; - - if (ip6_fw_ctl_ptr == NULL) - { - return EINVAL; - } - error = (*ip6_fw_ctl_ptr)(optname, mp); - if (error == 0) - error = soopt_mcopyout(sopt, m); /* XXX */ - if (error == 0 && m) - m_freem(m); - } - break; - default: error = ENOPROTOOPT; break; |