Remove IPCOMP option, it's now part of IPSEC option. You still need to

enable ipcomp via sysctl to use it. deraadt@ ok.

4 files changed, 4 insertions, 18 deletions

diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 8a369bc4562..d237f6fbd6f 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_proto.c,v 1.31 2001/07/05 16:45:54 jjbg Exp $	*/
+/*	$OpenBSD: in_proto.c,v 1.32 2001/08/08 15:07:04 jjbg Exp $	*/
 /*	$NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $	*/
 
 /*
@@ -285,13 +285,11 @@ struct protosw inetsw[] = {
   rip_usrreq,
   0,          0,              0,              0,		etherip_sysctl
 },
-#ifdef IPCOMP
 { SOCK_RAW,   &inetdomain,    IPPROTO_IPCOMP, PR_ATOMIC|PR_ADDR,
   ipcomp4_input,  rip_output, 0,              rip_ctloutput,
   rip_usrreq,
   0,          0,              0,              0,                ipcomp_sysctl
 },
-#endif /* IPCOMP */
 #endif /* IPSEC */
 #if NGRE > 0
 { SOCK_RAW,     &inetdomain,    IPPROTO_GRE,    PR_ATOMIC|PR_ADDR,
diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c
index bfaf654946f..483615a3587 100644
--- a/sys/netinet/ip_ipsp.c
+++ b/sys/netinet/ip_ipsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ipsp.c,v 1.140 2001/07/05 16:45:54 jjbg Exp $	*/
+/*	$OpenBSD: ip_ipsp.c,v 1.141 2001/08/08 15:07:04 jjbg Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr),
@@ -118,11 +118,9 @@ struct xformsw xformsw[] = {
 	{ XF_ESP,	 XFT_CONF|XFT_AUTH, "IPsec ESP",
 	  esp_attach,	esp_init,  esp_zeroize,
 	  esp_input,	esp_output, },
-#ifdef IPCOMP
 	{ XF_IPCOMP,	XFT_COMP, "IPcomp",
 	  ipcomp_attach,    ipcomp_init, ipcomp_zeroize,
 	  ipcomp_input,     ipcomp_output, },
-#endif /* IPCOMP */
 #ifdef TCP_SIGNATURE
 	{ XF_TCPSIGNATURE,	 XFT_AUTH, "TCP MD5 Signature Option, RFC 2385",
 	  tcp_signature_tdb_attach, 	tcp_signature_tdb_init,
diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c
index 7216c4081eb..e0a876a3ee7 100644
--- a/sys/netinet/ipsec_input.c
+++ b/sys/netinet/ipsec_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipsec_input.c,v 1.51 2001/08/07 14:07:47 deraadt Exp $	*/
+/*	$OpenBSD: ipsec_input.c,v 1.52 2001/08/08 15:07:04 jjbg Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -603,10 +603,8 @@ ipsec_common_input_cb(struct mbuf *m, struct tdb *tdbp, int skip, int protoff,
 		case IPPROTO_AH:
 			return ah4_input_cb(m);
 
-#ifdef IPCOMP
 		case IPPROTO_IPCOMP:
 			return ipcomp4_input_cb(m);
-#endif /* IPCOMP */
 
 		default:
 			DPRINTF(("ipsec_common_input_cb(): unknown/unsupported"
@@ -626,10 +624,8 @@ ipsec_common_input_cb(struct mbuf *m, struct tdb *tdbp, int skip, int protoff,
 		case IPPROTO_AH:
 			return ah6_input_cb(m, skip, protoff);
 
-#ifdef IPCOMP
 		case IPPROTO_IPCOMP:
 			return ipcomp6_input_cb(m, skip, protoff);
-#endif /* IPCOMP */
 
 		default:
 			DPRINTF(("ipsec_common_input_cb(): unknown/unsupported"
@@ -801,7 +797,6 @@ esp4_input_cb(struct mbuf *m, ...)
 }
 
 /* IPv4 IPCOMP wrapper */
-#ifdef IPCOMP
 void
 ipcomp4_input(struct mbuf *m, ...)
 {
@@ -842,7 +837,6 @@ ipcomp4_input_cb(struct mbuf *m, ...)
 
 	return 0;
 }
-#endif /* IPCOMP */
 
 void *
 ipsec_common_ctlinput(int cmd, struct sockaddr *sa, void *v, int proto)
@@ -1059,7 +1053,6 @@ esp6_input_cb(struct mbuf *m, int skip, int protoff)
 }
 
 /* IPv6 IPcomp wrapper */
-#ifdef IPCOMP
 int
 ipcomp6_input(struct mbuf **mp, int *offp, int proto)
 {
@@ -1111,7 +1104,6 @@ ipcomp6_input_cb(struct mbuf *m, int skip, int protoff)
 {
 	return ah6_input_cb(m, skip, protoff);
 }
-#endif /* IPCOMP */
 
 #endif /* INET6 */
 
diff --git a/sys/netinet/ipsec_output.c b/sys/netinet/ipsec_output.c
index c94ed53b425..a6fa367052c 100644
--- a/sys/netinet/ipsec_output.c
+++ b/sys/netinet/ipsec_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipsec_output.c,v 1.18 2001/07/05 16:45:55 jjbg Exp $ */
+/*	$OpenBSD: ipsec_output.c,v 1.19 2001/08/08 15:07:04 jjbg Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
  *
@@ -292,7 +292,6 @@ ipsp_process_packet(struct mbuf *m, struct tdb *tdb, int af, int tunalready)
 #endif /* INET6 */
 	}
 
-#ifdef IPCOMP
 	/* Non expansion policy for IPCOMP */
 	if (tdb->tdb_sproto == IPPROTO_IPCOMP) {
 		if ((m->m_pkthdr.len - i) < tdb->tdb_compalgxform->minlen) {
@@ -300,7 +299,6 @@ ipsp_process_packet(struct mbuf *m, struct tdb *tdb, int af, int tunalready)
 			return ipsp_process_done(m, tdb);
 		}
 	}
-#endif /* IPCOMP */
 
 	/* Invoke the IPsec transform. */
 	return (*(tdb->tdb_xform->xf_output))(m, tdb, NULL, i, off);