From a28436ecc72b1f1ffa0be946ad24b42629ba37ea Mon Sep 17 00:00:00 2001
From: Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org>
Date: Fri, 16 Feb 2001 16:38:16 +0000
Subject: get rid of #ifdef IPV6FIREWALL (never used, will never be used)

---
 sys/netinet6/ip6_output.c | 54 +----------------------------------------------
 1 file changed, 1 insertion(+), 53 deletions(-)

(limited to 'sys/netinet6/ip6_output.c')

diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index dfba4518e67..3e003d34468 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_output.c,v 1.24 2001/02/16 14:58:13 itojun Exp $	*/
+/*	$OpenBSD: ip6_output.c,v 1.25 2001/02/16 16:38:15 itojun Exp $	*/
 /*	$KAME: ip6_output.c,v 1.164 2001/02/10 05:05:15 itojun Exp $	*/
 
 /*
@@ -105,10 +105,6 @@ extern int ipsec_esp_network_default_level;
 
 #include <net/net_osdep.h>
 
-#ifdef IPV6FIREWALL
-#include <netinet6/ip6_fw.h>
-#endif
-
 struct ip6_exthdrs {
 	struct mbuf *ip6e_ip6;
 	struct mbuf *ip6e_hbh;
@@ -880,25 +876,6 @@ skip_ipsec2:;
 			ip6->ip6_dst.s6_addr16[1] = 0;
 	}
 
-#ifdef IPV6FIREWALL
-	/*
-	 * Check with the firewall...
-	 */
-	if (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;
-		}
-	}
-#endif
-
 	/*
 	 * If the outgoing packet contains a hop-by-hop options header,
 	 * it must be examined and processed even by the source node.
@@ -1444,21 +1421,6 @@ ip6_ctloutput(op, so, level, optname, mp)
 				break;
 #endif /* IPSEC */
 
-#ifdef IPV6FIREWALL
-			case IPV6_FW_ADD:
-			case IPV6_FW_DEL:
-			case IPV6_FW_FLUSH:
-			case IPV6_FW_ZERO:
-			    {
-				if (ip6_fw_ctl_ptr == NULL) {
-					if (m) (void)m_free(m);
-					return EINVAL;
-				}
-				error = (*ip6_fw_ctl_ptr)(optname, mp);
-				m = *mp;
-			    }
-				break;
-#endif
 			case IPSEC6_OUTSA:
 #ifndef IPSEC
 				error = EINVAL;
@@ -1676,20 +1638,6 @@ ip6_ctloutput(op, so, level, optname, mp)
 			  }
 #endif /* IPSEC */
 
-#ifdef IPV6FIREWALL
-			case IPV6_FW_GET:
-			  {
-				if (ip6_fw_ctl_ptr == NULL)
-			        {
-					if (m)
-						(void)m_free(m);
-					return EINVAL;
-				}
-				error = (*ip6_fw_ctl_ptr)(optname, mp);
-			  }
-				break;
-#endif
-
 			case IPSEC6_OUTSA:
 #ifndef IPSEC
 				error = EINVAL;
-- 
cgit v1.2.3