34c34
< * $FreeBSD: head/sys/netinet/raw_ip.c 54799 1999-12-19 01:55:37Z green $
---
> * $FreeBSD: head/sys/netinet/raw_ip.c 55009 1999-12-22 19:13:38Z shin $
36a37,39
> #include "opt_inet6.h"
> #include "opt_ipsec.h"
>
63a67,70
> #ifdef IPSEC
> #include <netinet6/ipsec.h>
> #endif /*IPSEC*/
>
108c115
< rip_input(m, iphlen)
---
> rip_input(m, off, proto)
110c117
< int iphlen;
---
> int off, proto;
118,119c125,127
< for (inp = ripcb.lh_first; inp != NULL; inp = inp->inp_list.le_next) {
< if (inp->inp_ip_p && inp->inp_ip_p != ip->ip_p)
---
> LIST_FOREACH(inp, &ripcb, inp_list) {
> #ifdef INET6
> if ((inp->inp_vflag & INP_IPV4) == 0)
120a129,131
> #endif
> if (inp->inp_ip_p && inp->inp_ip_p != proto)
> continue;
218c229,235
< return (ip_output(m, inp->inp_options, &inp->inp_route, flags,
---
>
> #ifdef IPSEC
> m->m_pkthdr.rcvif = (struct ifnet *)so; /*XXX*/
> #endif /*IPSEC*/
>
> return (ip_output(m, inp->inp_options, &inp->inp_route,
> flags | IP_SOCKINMRCVIF,
433a451,453
> error = soreserve(so, rip_sendspace, rip_recvspace);
> if (error)
> return error;
439,441d458
< error = soreserve(so, rip_sendspace, rip_recvspace);
< if (error)
< return error;
442a460
> inp->inp_vflag |= INP_IPV4;
443a462,468
> #ifdef IPSEC
> error = ipsec_init_policy(so, &inp->inp_sp);
> if (error != 0) {
> in_pcbdetach(inp);
> return error;
> }
> #endif /*IPSEC*/