diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 1999-12-28 07:43:41 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 1999-12-28 07:43:41 +0000 |
| commit | 532b2d7032553a061e5e6df15f0ccbafeea809e8 (patch) | |
| tree | 94eb8038ed70ded271b0808598411767821e0718 | |
| parent | fe2f2bbaf86fdbcb4711e525c48bf89960e265ed (diff) | |
remove unused part of kame patch from the tree. openbsd does not pass
"proto" around as xx_input argument.
(sync with kame change)
| -rw-r--r-- | sys/netinet/ip_icmp.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 5c7d16adb92..8574065f73d 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_icmp.c,v 1.19 1999/12/08 06:50:19 itojun Exp $ */ +/* $OpenBSD: ip_icmp.c,v 1.20 1999/12/28 07:43:40 itojun Exp $ */ /* $NetBSD: ip_icmp.c,v 1.19 1996/02/13 23:42:22 christos Exp $ */ /* @@ -72,12 +72,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>. #include <netinet/ip_var.h> #include <netinet/icmp_var.h> -#if 0 /*KAME IPSEC*/ -#include <netinet6/ipsec.h> -#include <netkey/key.h> -#include <netkey/key_debug.h> -#endif - #include <machine/stdarg.h> /* @@ -223,7 +217,6 @@ icmp_input(m, va_alist) va_dcl #endif { - int proto; register struct icmp *icp; register struct ip *ip = mtod(m, struct ip *); int icmplen = ip->ip_len; @@ -237,7 +230,6 @@ icmp_input(m, va_alist) va_start(ap, m); hlen = va_arg(ap, int); - proto = va_arg(ap, int); va_end(ap); /* @@ -281,13 +273,6 @@ icmp_input(m, va_alist) printf("icmp_input, type %d code %d\n", icp->icmp_type, icp->icmp_code); #endif -#if 0 /*KAME IPSEC*/ - /* drop it if it does not match the policy */ - if (ipsec4_in_reject(m, NULL)) { - ipsecstat.in_polvio++; - goto freeit; - } -#endif if (icp->icmp_type > ICMP_MAXTYPE) goto raw; icmpstat.icps_inhist[icp->icmp_type]++; @@ -509,9 +494,6 @@ reflect: (struct sockaddr *)0, RTF_GATEWAY | RTF_HOST, sintosa(&icmpgw), (struct rtentry **)0); pfctlinput(PRC_REDIRECT_HOST, sintosa(&icmpsrc)); -#if 0 /*KAME IPSEC*/ - key_sa_routechange((struct sockaddr *)&icmpsrc); -#endif break; /* @@ -529,7 +511,7 @@ reflect: } raw: - rip_input(m, hlen, proto); + rip_input(m); return; freeit: @@ -689,9 +671,6 @@ icmp_send(m, opts) buf, inet_ntoa(ip->ip_src)); } #endif -#if 0 /*KAME IPSEC*/ - m->m_pkthdr.rcvif = NULL; -#endif /*IPSEC*/ (void) ip_output(m, opts, NULL, 0, NULL, NULL); } |