remove kame IPSEC code within #ifdef.

3 files changed, 3 insertions, 49 deletions

diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 019f1315100..9f6345d9ab0 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp6.c,v 1.48 2001/11/06 19:53:20 miod Exp $	*/
+/*	$OpenBSD: icmp6.c,v 1.49 2001/12/06 04:19:25 itojun Exp $	*/
 /*	$KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $	*/
 
 /*
@@ -95,8 +95,6 @@
 #include <netinet6/in6_ifattach.h>
 #include <netinet6/ip6protosw.h>
 
-#undef IPSEC
-
 #include "faith.h"
 
 /* inpcb members */
@@ -484,14 +482,6 @@ icmp6_input(mp, offp, proto)
 	}
 #endif
 
-#ifdef IPSEC
-	/* drop it if it does not match the default policy */
-	if (ipsec6_in_reject(m, NULL)) {
-		ipsec6stat.in_polvio++;
-		goto freeit;
-	}
-#endif
-
 	icmp6stat.icp6s_inhist[icmp6->icmp6_type]++;
 	icmp6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_msg);
 	if (icmp6->icmp6_type < ICMP6_INFOMSG_MASK)
@@ -2168,9 +2158,6 @@ icmp6_reflect(m, off)
 	 */
 
 	m->m_flags &= ~(M_BCAST|M_MCAST);
-#ifdef IPSEC
-	m->m_pkthdr.rcvif = NULL;
-#endif /*IPSEC*/
 
 	ip6_output(m, NULL, NULL, 0, NULL, &outif);
 
@@ -2415,9 +2402,6 @@ icmp6_redirect_input(m, off)
 	sdst.sin6_len = sizeof(struct sockaddr_in6);
 	bcopy(&reddst6, &sdst.sin6_addr, sizeof(struct in6_addr));
 	pfctlinput(PRC_REDIRECT_HOST, (struct sockaddr *)&sdst);
-#ifdef IPSEC
-	key_sa_routechange((struct sockaddr *)&sdst);
-#endif
     }
 
  freeit:
@@ -2691,9 +2675,6 @@ noredhdropt:;
 		= in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), ntohs(ip6->ip6_plen));
 
 	/* send the packet to outside... */
-#ifdef IPSEC
-	m->m_pkthdr.rcvif = NULL;
-#endif /*IPSEC*/
 	ip6_output(m, NULL, NULL, 0, NULL, &outif);
 	if (outif) {
 		icmp6_ifstat_inc(outif, ifs6_out_msg);
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 579393ec27a..bca4c0814c6 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raw_ip6.c,v 1.5 2001/04/06 04:42:09 csapuntz Exp $	*/
+/*	$OpenBSD: raw_ip6.c,v 1.6 2001/12/06 04:19:26 itojun Exp $	*/
 /*	$KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $	*/
 
 /*
@@ -93,14 +93,6 @@
 #include <netinet6/scope6_var.h>
 #endif
 
-#ifdef __OpenBSD__
-#undef IPSEC
-#endif
-
-#ifdef IPSEC
-#include <netinet6/ipsec.h>
-#endif /*IPSEC*/
-
 #include <machine/stdarg.h>
 
 #include "faith.h"
@@ -491,13 +483,6 @@ rip6_output(m, va_alist)
 		m_copyback(m, off, sizeof(sum), (caddr_t)&sum);
 	}
 
-#ifdef IPSEC
-	if (ipsec_setsocket(m, so) != 0) {
-		error = ENOBUFS;
-		goto bad;
-	}
-#endif /*IPSEC*/
-
 	flags = 0;
 #ifdef IN6P_MINMTU
 	if (in6p->in6p_flags & IN6P_MINMTU)
@@ -621,13 +606,6 @@ rip6_usrreq(so, req, m, nam, control, p)
 		in6p = sotoin6pcb(so);
 		in6p->in6p_ip6.ip6_nxt = (long)nam;
 		in6p->in6p_cksum = -1;
-#ifdef IPSEC
-		error = ipsec_init_policy(so, &in6p->in6p_sp);
-		if (error != 0) {
-			in6_pcbdetach(in6p);
-			break;
-		}
-#endif /*IPSEC*/
 		
 		MALLOC(in6p->in6p_icmp6filt, struct icmp6_filter *,
 			sizeof(struct icmp6_filter), M_PCB, M_NOWAIT);
diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index 9348a37f8a8..c51cd703b10 100644
--- a/sys/netinet6/udp6_output.c
+++ b/sys/netinet6/udp6_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udp6_output.c,v 1.4 2001/06/09 06:43:38 angelos Exp $	*/
+/*	$OpenBSD: udp6_output.c,v 1.5 2001/12/06 04:19:26 itojun Exp $	*/
 /*	$KAME: udp6_output.c,v 1.21 2001/02/07 11:51:54 itojun Exp $	*/
 
 /*
@@ -93,8 +93,6 @@
 #include <netinet/icmp6.h>
 #include <netinet6/ip6protosw.h>
 
-#undef IPSEC
-
 #include "faith.h"
 
 /*
@@ -272,9 +270,6 @@ udp6_output(in6p, m, addr6, control)
 #endif
 
 		udp6stat.udp6s_opackets++;
-#ifdef IPSEC
-		ipsec_setsocket(m, in6p->in6p_socket);
-#endif /*IPSEC*/
 		error = ip6_output(m, in6p->in6p_outputopts, &in6p->in6p_route,
 			    flags, in6p->in6p_moptions, NULL);
 		break;