diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-01-13 04:59:39 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-01-13 04:59:39 +0000 |
| commit | f20f4e54963db3b234309be7e57ceec18627a77c (patch) | |
| tree | ffbd1b80167f887d437b564f1a2ff841e20608a6 | |
| parent | 192f2c87939819c3cb2efdaa4c71b85d76f5660a (diff) | |
Introduce ip4_input6() with the correct prototype...
| -rw-r--r-- | sys/netinet6/in6_proto.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 2894b849745..c1b8d2b7fe4 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_proto.c,v 1.10 2000/01/13 04:09:00 angelos Exp $ */ +/* $OpenBSD: in6_proto.c,v 1.11 2000/01/13 04:59:38 angelos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -90,13 +90,9 @@ #include <netinet/tcp_var.h> #include <netinet/udp.h> #include <netinet/udp_var.h> -#include <netinet/ip_ip4.h> - -#ifdef IPSEC #include <netinet/ip_ipsp.h> #include <netinet/ip_ah.h> #include <netinet/ip_esp.h> -#endif /* IPSEC */ #include <netinet6/pim6_var.h> @@ -214,13 +210,13 @@ struct ip6protosw inet6sw[] = { #endif /* INET6 */ #else /* NFIG */ { SOCK_RAW, &inet6domain, IPPROTO_IPV4, PR_ATOMIC|PR_ADDR, - ip4_input, rip6_output, 0, rip6_ctloutput, + ip4_input6, rip6_output, 0, rip6_ctloutput, rip6_usrreq, /* XXX */ 0, 0, 0, 0, ip4_sysctl }, #ifdef INET6 { SOCK_RAW, &inet6domain, IPPROTO_IPV6, PR_ATOMIC|PR_ADDR, - ip4_input, rip6_output, 0, rip6_ctloutput, + ip4_input6, rip6_output, 0, rip6_ctloutput, 0, 0, 0, 0, 0, }, |