diff options
Diffstat (limited to 'src/network/socket')
-rw-r--r-- | src/network/socket/qnativesocketengine_unix.cpp | 15 | ||||
-rw-r--r-- | src/network/socket/qnativesocketengine_win.cpp | 16 |
2 files changed, 31 insertions, 0 deletions
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index ae7e239309..09aed255d6 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -922,6 +922,21 @@ bool QNativeSocketEnginePrivate::fetchConnectionParameters() return false; } +#if defined (IPV6_V6ONLY) + // determine if local address is dual mode + int ipv6only = 0; + socklen_t optlen = sizeof(ipv6only); + if (localAddress == QHostAddress::AnyIPv6 + && !getsockopt(socketDescriptor, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&ipv6only, &optlen )) { + if (optlen != sizeof(ipv6only)) + qWarning("unexpected size of IPV6_V6ONLY socket option"); + if (!ipv6only) { + socketProtocol = QAbstractSocket::AnyIPProtocol; + localAddress = QHostAddress::Any; + } + } +#endif + // Determine the remote address if (!::getpeername(socketDescriptor, &sa.a, &sockAddrSize)) qt_socket_getPortAndAddress(&sa, &peerPort, &peerAddress); diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index 4be930bb20..247de01072 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -554,6 +554,22 @@ bool QNativeSocketEnginePrivate::fetchConnectionParameters() } } +#if defined (IPV6_V6ONLY) + // determine if local address is dual mode + DWORD ipv6only = 0; + int optlen = sizeof(ipv6only); + if (localAddress == QHostAddress::AnyIPv6 + && QSysInfo::windowsVersion() >= QSysInfo::WV_6_0 + && !getsockopt(socketDescriptor, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&ipv6only, &optlen )) { + if (optlen != sizeof(ipv6only)) + qWarning("unexpected size of IPV6_V6ONLY socket option"); + if (!ipv6only) { + socketProtocol = QAbstractSocket::AnyIPProtocol; + localAddress = QHostAddress::Any; + } + } +#endif + memset(&sa, 0, sizeof(sa)); if (::getpeername(socketDescriptor, &sa.a, &sockAddrSize) == 0) { qt_socket_getPortAndAddress(socketDescriptor, &sa, &peerPort, &peerAddress); |