diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 1999-10-28 03:21:52 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 1999-10-28 03:21:52 +0000 |
| commit | 87438b8ee3e279d658cd4e1c5bd6e2441dd09713 (patch) | |
| tree | 5e7b6da56a22ca84200d16a595dce56eecf9ac5f | |
| parent | 9e43f2683d9a541012d6da5e0eb41b9dd0ca2dc9 (diff) | |
Add IPPROTO_ETHERIP in the protocol switch; comment out INET6 IPv4-IPv4
handling that was re-using ipv4_input() instead of using ip4_input()
from netinet/ip_ip4.c
| -rw-r--r-- | sys/netinet/in_proto.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index ac544657bc8..ed387d1efb3 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_proto.c,v 1.14 1999/04/20 20:06:11 niklas Exp $ */ +/* $OpenBSD: in_proto.c,v 1.15 1999/10/28 03:21:51 angelos Exp $ */ /* $NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $ */ /* @@ -115,6 +115,7 @@ void iplinit __P((void)); #include <netinet/ip_ah.h> #include <netinet/ip_esp.h> #include <netinet/ip_ip4.h> +#include <netinet/ip_ether.h> #endif extern struct domain inetdomain; @@ -197,6 +198,11 @@ struct protosw inetsw[] = { rip_usrreq, 0, 0, 0, 0, esp_sysctl }, +{ SOCK_RAW, &inetdomain, IPPROTO_ETHERIP, PR_ATOMIC|PR_ADDR, + etherip_input, rip_output, 0, rip_ctloutput, + rip_usrreq, + 0, 0, 0, 0, etherip_sysctl +}, #endif #ifdef INET6 /* IPv6 in IPv4 tunneled packets... */ @@ -205,12 +211,14 @@ struct protosw inetsw[] = { rip_usrreq, 0, 0, 0, 0 }, +#if 0 /* IPv4 in IPv4 tunneled packets... */ { SOCK_RAW, &inetdomain, IPPROTO_IPV4, PR_ATOMIC|PR_ADDR, ipv4_input, 0, 0, 0, 0, 0, 0, 0, 0 }, +#endif /* 0 */ #endif /* defined(INET6) */ /* raw wildcard */ { SOCK_RAW, &inetdomain, 0, PR_ATOMIC|PR_ADDR, |