summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>1998-07-30 03:53:23 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>1998-07-30 03:53:23 +0000
commitabcd8213828520013c8a306bce86c7d5b64963c1 (patch)
tree0af88dcd1fcafe1f2526b22ae75f07a681c01966
parentce5151075aee547aa4035027e1ad35bdfbce7eae (diff)
Forgot this one with the previous batch of commits; use ip4_input()
instead of ipip_input() whenever possible, it seems more stable.
-rw-r--r--sys/netinet/in_proto.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 2e17a71f3e7..3d1fa512c21 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_proto.c,v 1.8 1998/03/18 10:16:25 provos Exp $ */
+/* $OpenBSD: in_proto.c,v 1.9 1998/07/30 03:53:22 angelos Exp $ */
/* $NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $ */
/*
@@ -134,15 +134,15 @@ struct protosw inetsw[] = {
rip_usrreq,
0, 0, 0, 0, icmp_sysctl
},
-#ifdef MROUTING
+#if defined(IPSEC)
{ SOCK_RAW, &inetdomain, IPPROTO_IPIP, PR_ATOMIC|PR_ADDR,
- ipip_input, rip_output, 0, rip_ctloutput,
+ ip4_input, rip_output, 0, rip_ctloutput,
rip_usrreq, /* XXX */
0, 0, 0, 0,
},
-#elif defined(IPSEC)
+#elif defined(MROUTING)
{ SOCK_RAW, &inetdomain, IPPROTO_IPIP, PR_ATOMIC|PR_ADDR,
- ip4_input, rip_output, 0, rip_ctloutput,
+ ipip_input, rip_output, 0, rip_ctloutput,
rip_usrreq, /* XXX */
0, 0, 0, 0,
},