AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QNativeSocketEngine Windows: bring bind() in line with Unix

Browse Source 
The IPv4+IPv6 dual stack code that has been in Qt since 5.0 has been
giving test failures for tst_qudpsocket: some binds that shouldn't
succeed do succeed. Instead, copy the core code from the Unix version so
the two OSes will behave the same way.

The one difference in behavior between Windows and Unix is that on Unix
you can bind an IPv4 address to a multicast IP and on Windows you can't.
So I left the "correction" that was in the original code, but I'm unsure
if it is the right thing to do. Are people expecting to join the
multicast group this way?

Change-Id: Iee8cbc07c4434ce9b560ffff13caa1c3d5a7e8fd
Reviewed-by: Richard J. Moore <rich@kde.org>
This commit is contained in:
Thiago Macieira 2015-03-11 20:13:16 -07:00
parent f35b8c004e
commit 2c64e05d49
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/network/socket/qnativesocketengine_win.cpp
View File

@ -775,42 +775,36 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &address, quin
bool QNativeSocketEnginePrivate::nativeBind(const QHostAddress &a, quint16 port) bool QNativeSocketEnginePrivate::nativeBind(const QHostAddress &a, quint16 port)
{ {
QHostAddress address = a; QHostAddress address = a;
DWORD ipv6only = 0; if (address.protocol() == QAbstractSocket::IPv4Protocol) {
switch (address.protocol()) {
case QAbstractSocket::IPv6Protocol:
if (address.toIPv6Address()[0] == 0xff) {
// binding to a multicast address
address = QHostAddress(QHostAddress::AnyIPv6);
}
//This is default in current windows versions, it may change in future so set it explicitly
if (QSysInfo::windowsVersion() >= QSysInfo::WV_6_0) {
ipv6only = 1;
ipv6only = ::setsockopt(socketDescriptor, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&ipv6only, sizeof(ipv6only) );
}
break;
case QAbstractSocket::IPv4Protocol:
if ((address.toIPv4Address() & 0xffff0000) == 0xefff0000) { if ((address.toIPv4Address() & 0xffff0000) == 0xefff0000) {
// binding to a multicast address // binding to a multicast address
address = QHostAddress(QHostAddress::AnyIPv4); address = QHostAddress(QHostAddress::AnyIPv4);
} }
break;
case QAbstractSocket::AnyIPProtocol:
if (QSysInfo::windowsVersion() >= QSysInfo::WV_6_0) {
ipv6only = ::setsockopt(socketDescriptor, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&ipv6only, sizeof(ipv6only) );
} else {
address = QHostAddress(QHostAddress::AnyIPv4); //xp/WS2003 and earlier don't support dual stack, so bind to IPv4
socketProtocol = QAbstractSocket::IPv4Protocol;
}
break;
default:
break;
} }
qt_sockaddr aa; qt_sockaddr aa;
QT_SOCKLEN_T sockAddrSize = 0; QT_SOCKLEN_T sockAddrSize = 0;
setPortAndAddress(port, address, &aa, &sockAddrSize); setPortAndAddress(port, address, &aa, &sockAddrSize);
if (aa.a.sa_family == AF_INET6) {
// The default may change in future, so set it explicitly
int ipv6only = 0;
if (address.protocol() == QAbstractSocket::IPv6Protocol)
ipv6only = 1;
::setsockopt(socketDescriptor, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&ipv6only, sizeof(ipv6only) );
}
int bindResult = ::bind(socketDescriptor, &aa.a, sockAddrSize); int bindResult = ::bind(socketDescriptor, &aa.a, sockAddrSize);
if (bindResult == SOCKET_ERROR && WSAGetLastError() == WSAEAFNOSUPPORT
&& address.protocol() == QAbstractSocket::AnyIPProtocol) {
// retry with v4
aa.a4.sin_family = AF_INET;
aa.a4.sin_port = htons(port);
aa.a4.sin_addr.s_addr = htonl(address.toIPv4Address());
sockAddrSize = sizeof(aa.a4);
bindResult = ::bind(socketDescriptor, &aa.a, sockAddrSize);
}
if (bindResult == SOCKET_ERROR) { if (bindResult == SOCKET_ERROR) {
int err = WSAGetLastError(); int err = WSAGetLastError();
WS_ERROR_DEBUG(err); WS_ERROR_DEBUG(err);