svn commit: r322648 - head/sys/netinet
Michael Tuexen
tuexen at FreeBSD.org
Fri Aug 18 07:27:17 UTC 2017
Author: tuexen
Date: Fri Aug 18 07:27:15 2017
New Revision: 322648
URL: https://svnweb.freebsd.org/changeset/base/322648
Log:
Ensure inp_vflag is consistently set for TCP endpoints.
Make sure that the flags INP_IPV4 and INP_IPV6 are consistently set
for inpcbs used for TCP sockets, no matter if the setting is derived
from the net.inet6.ip6.v6only sysctl or the IPV6_V6ONLY socket option.
For UDP this was already done right.
PR: 221385
MFC after: 1 week
Modified:
head/sys/netinet/tcp_usrreq.c
Modified: head/sys/netinet/tcp_usrreq.c
==============================================================================
--- head/sys/netinet/tcp_usrreq.c Fri Aug 18 07:00:00 2017 (r322647)
+++ head/sys/netinet/tcp_usrreq.c Fri Aug 18 07:27:15 2017 (r322648)
@@ -1918,6 +1918,8 @@ tcp_attach(struct socket *so)
#ifdef INET6
if (inp->inp_vflag & INP_IPV6PROTO) {
inp->inp_vflag |= INP_IPV6;
+ if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0)
+ inp->inp_vflag |= INP_IPV4;
inp->in6p_hops = -1; /* use kernel default */
}
else
More information about the svn-src-head
mailing list