63c63
< * $FreeBSD: head/sys/netinet6/udp6_usrreq.c 54952 1999-12-21 11:14:12Z eivind $
---
> * $FreeBSD: head/sys/netinet6/udp6_usrreq.c 55009 1999-12-22 19:13:38Z shin $
65a66,67
> #include "opt_ipsec.h"
>
100a103
> #include <netinet6/ipsec6.h>
254,255c257
< if (last != NULL &&
< ipsec6_in_reject_so(m, last->inp_socket)) {
---
> if (ipsec6_in_reject_so(m, last->inp_socket))
258c260
< } else
---
> else
313c315
< if (last != NULL && ipsec6_in_reject_so(m, last->inp_socket)) {
---
> if (ipsec6_in_reject_so(m, last->inp_socket)) {
361c363
< if (in6p != NULL && ipsec6_in_reject_so(m, in6p->in6p_socket)) {
---
> if (ipsec6_in_reject_so(m, in6p->in6p_socket)) {
478c480
< if (!inp || !inp->inp_socket || !inp->inp_socket->so_cred) {
---
> if (!inp || !inp->inp_socket) {
559,560c561,564
< ip6->ip6_flow = in6p->in6p_flowinfo & IPV6_FLOWINFO_MASK;
< ip6->ip6_vfc = IPV6_VERSION;
---
> ip6->ip6_flow = (ip6->ip6_flow & ~IPV6_FLOWINFO_MASK) |
> (in6p->in6p_flowinfo & IPV6_FLOWINFO_MASK);
> ip6->ip6_vfc = (ip6->ip6_vfc & ~IPV6_VERSION_MASK) |
> (IPV6_VERSION & IPV6_VERSION_MASK);
587c591
< 0, in6p->in6p_moptions, NULL);
---
> IPV6_SOCKINMRCVIF, in6p->in6p_moptions, NULL);