diff options
author | suz <suz@FreeBSD.org> | 2002-04-19 04:46:24 +0000 |
---|---|---|
committer | suz <suz@FreeBSD.org> | 2002-04-19 04:46:24 +0000 |
commit | 553226e8e16639b00d61d81e0125330dbfb7eed8 (patch) | |
tree | 100274bd96d0c95cafbe1a4a5961b54fc403fd47 /sys/netinet6/udp6_usrreq.c | |
parent | ae841d33c320c4185ecaa0e982c744039b1ba10f (diff) | |
download | FreeBSD-src-553226e8e16639b00d61d81e0125330dbfb7eed8.zip FreeBSD-src-553226e8e16639b00d61d81e0125330dbfb7eed8.tar.gz |
just merged cosmetic changes from KAME to ease sync between KAME and FreeBSD.
(based on freebsd4-snap-20020128)
Reviewed by: ume
MFC after: 1 week
Diffstat (limited to 'sys/netinet6/udp6_usrreq.c')
-rw-r--r-- | sys/netinet6/udp6_usrreq.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index f1bf3a9..1c1fdb04 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -104,7 +104,7 @@ #ifdef IPSEC #include <netinet6/ipsec.h> #include <netinet6/ipsec6.h> -#endif /*IPSEC*/ +#endif /* IPSEC */ /* * UDP protocol inplementation. @@ -218,7 +218,7 @@ udp6_input(mp, offp, proto) init_sin6(&udp_in6, m); /* general init */ udp_in6.sin6_port = uh->uh_sport; /* - * KAME note: usually we drop udphdr from mbuf here. + * KAME note: traditionally we dropped udpiphdr from mbuf here. * We need udphdr for IPsec processing so we do that later. */ @@ -257,7 +257,7 @@ udp6_input(mp, offp, proto) ipsec6stat.in_polvio++; /* do not inject data into pcb */ else -#endif /*IPSEC*/ +#endif /* IPSEC */ if ((n = m_copy(m, 0, M_COPYALL)) != NULL) { /* * KAME NOTE: do not @@ -316,7 +316,7 @@ udp6_input(mp, offp, proto) ipsec6stat.in_polvio++; goto bad; } -#endif /*IPSEC*/ +#endif /* IPSEC */ if (last->in6p_flags & IN6P_CONTROLOPTS || last->in6p_socket->so_options & SO_TIMESTAMP) ip6_savecontrol(last, &opts, ip6, m); @@ -364,7 +364,7 @@ udp6_input(mp, offp, proto) ipsec6stat.in_polvio++; goto bad; } -#endif /*IPSEC*/ +#endif /* IPSEC */ /* * Construct sockaddr format source address. @@ -616,7 +616,6 @@ udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td) return error; } } - if (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr)) return EISCONN; s = splnet(); |