summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>1999-12-21 11:11:17 +0000
committerJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>1999-12-21 11:11:17 +0000
commitd6ca8e9f232f8a59041c5b2d42c1afa367fe7f08 (patch)
tree88de8ff9afca51627dd742ff9ecc6301a53f1cf0
parent87852f3592239acfd199e6c63d2b1a76b6c9aa87 (diff)
fix non-IPsec compilation. (too complex #ifdef...)
-rw-r--r--sys/netinet/in_proto.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 4260265267a..1e2c4ff0aa4 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_proto.c,v 1.18 1999/12/21 09:00:52 itojun Exp $ */
+/* $OpenBSD: in_proto.c,v 1.19 1999/12/21 11:11:16 itojun Exp $ */
/* $NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $ */
/*
@@ -149,6 +149,9 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
#ifdef MROUTING
#include <netinet/ip_mroute.h>
+#ifndef IPSEC
+#include <netinet/ip_ip4.h>
+#endif
#endif /* MROUTING */
#ifdef IPFILTER
@@ -210,6 +213,7 @@ struct protosw inetsw[] = {
},
#endif /* INET6 */
#else /* NGIF */
+#if defined(IPSEC) || defined(MROUTING)
{ SOCK_RAW, &inetdomain, IPPROTO_IPIP, PR_ATOMIC|PR_ADDR,
ip4_input, rip_output, 0, rip_ctloutput,
rip_usrreq, /* XXX */
@@ -222,6 +226,7 @@ struct protosw inetsw[] = {
0, 0, 0, 0,
},
#endif /* INET6 */
+#endif /* IPSEC || MROUTING */
#endif /*NGIF*/
{ SOCK_RAW, &inetdomain, IPPROTO_IGMP, PR_ATOMIC|PR_ADDR,
igmp_input, rip_output, 0, rip_ctloutput,