From 1a52819c70306d5af7a10c0841eb0e5a625656a5 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Wed, 30 Nov 2011 17:21:51 +0000 Subject: Fix QTcpServer::serverAddress() for dual stack sockets When listening on QHostAddress::Any, serverAddress() should return QHostAddress::Any too, assuming that setting the socket options was successful. Task-number: QTBUG-22899 Change-Id: I50a9ff1b4ad0c1c1905e2952c595d7068df2627d Reviewed-by: Thiago Macieira --- src/network/socket/qnativesocketengine_win.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/network/socket/qnativesocketengine_win.cpp') 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); -- cgit v1.2.3