34c34
< * $FreeBSD: head/sys/netinet/ip_icmp.c 51282 1999-09-14 16:40:28Z des $
---
> * $FreeBSD: head/sys/netinet/ip_icmp.c 55009 1999-12-22 19:13:38Z shin $
36a37,38
> #include "opt_ipsec.h"
>
57a60,69
> #ifdef IPSEC
> #include <netinet6/ipsec.h>
> #include <netkey/key.h>
> #endif
>
> #include "faith.h"
> #if defined(NFAITH) && NFAITH > 0
> #include <net/if_types.h>
> #endif
>
222c234
< icmp_input(m, hlen)
---
> icmp_input(m, off, proto)
224c236
< int hlen;
---
> int off, proto;
225a238
> int hlen = off;
265a279,293
> #if defined(NFAITH) && 0 < NFAITH
> if (m->m_pkthdr.rcvif && m->m_pkthdr.rcvif->if_type == IFT_FAITH) {
> /*
> * Deliver very specific ICMP type only.
> */
> switch (icp->icmp_type) {
> case ICMP_UNREACH:
> case ICMP_TIMXCEED:
> break;
> default:
> goto freeit;
> }
> }
> #endif
>
271a300,308
> #ifdef IPSEC
> /* drop it if it does not match the policy */
> /* XXX Is there meaning of check in here ? */
> if (ipsec4_in_reject(m, NULL)) {
> ipsecstat.in_polvio++;
> goto freeit;
> }
> #endif
>
396a434,437
> /*
> * XXX if the packet contains [IPv4 AH TCP], we can't make a
> * notification to TCP layer.
> */
520a562,564
> #ifdef IPSEC
> key_sa_routechange((struct sockaddr *)&icmpsrc);
> #endif
538c582
< rip_input(m, hlen);
---
> rip_input(m, off, proto);