diff options
Diffstat (limited to 'tests')
6 files changed, 84 insertions, 36 deletions
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 4c36e2d308..72ff9bbc33 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -44,6 +44,12 @@ #include <QtNetwork/QHostInfo> #endif +#ifdef Q_OS_UNIX +#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h> +#endif + class QtNetworkSettings { public: @@ -112,6 +118,27 @@ public: return false; } + static bool hasIPv6() + { +#ifdef Q_OS_UNIX + int s = ::socket(AF_INET6, SOCK_DGRAM, 0); + if (s == -1) + return false; + else { + struct sockaddr_in6 addr; + memset(&addr, 0, sizeof(addr)); + addr.sin6_family = AF_INET6; + memcpy(&addr.sin6_addr, &in6addr_loopback, sizeof(in6_addr)); + if (-1 == ::bind(s, (sockaddr*)&addr, sizeof(addr))) { + ::close(s); + return false; + } + } +#endif + return true; + } + + #ifdef QT_NETWORK_LIB static bool verifyTestNetworkSettings() { diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro index f267b09631..faa584ca6e 100644 --- a/tests/auto/network/access/qnetworkreply/test/test.pro +++ b/tests/auto/network/access/qnetworkreply/test/test.pro @@ -8,7 +8,6 @@ contains(QT_CONFIG,xcb): CONFIG+=insignificant_test # unstable, QTBUG-21102 QT = core-private network-private testlib RESOURCES += ../qnetworkreply.qrc -contains(QT_CONFIG,ipv6ifname): DEFINES += HAVE_IPV6 TESTDATA += ../empty ../rfc3252.txt ../resource ../bigfile ../*.jpg ../certs \ ../index.html ../smb-file.txt diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index e3386406fc..2c02df0f13 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -2501,9 +2501,8 @@ void tst_QNetworkReply::connectToIPv6Address() QFETCH(QByteArray, dataToSend); QFETCH(QByteArray, hostfield); -#if !defined(HAVE_IPV6) && defined(Q_OS_UNIX) - QSKIP("system doesn't support ipv6!"); -#endif + if (!QtNetworkSettings::hasIPv6()) + QSKIP("system doesn't support ipv6!"); QByteArray httpResponse = QByteArray("HTTP/1.0 200 OK\r\nContent-Length: "); httpResponse += QByteArray::number(dataToSend.size()); diff --git a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp index ffcc9cfc97..aa59c08c94 100644 --- a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp +++ b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp @@ -572,14 +572,16 @@ void tst_PlatformSocketEngine::bind() QVERIFY(!binder3.bind(QHostAddress::AnyIPv4, 31180)); QVERIFY(binder3.error() == QAbstractSocket::AddressInUseError); - PLATFORMSOCKETENGINE binder4; - QVERIFY(binder4.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv6Protocol)); - QVERIFY(binder4.bind(QHostAddress::AnyIPv6, 31180)); - - PLATFORMSOCKETENGINE binder5; - QVERIFY(binder5.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv6Protocol)); - QVERIFY(!binder5.bind(QHostAddress::AnyIPv6, 31180)); - QVERIFY(binder5.error() == QAbstractSocket::AddressInUseError); + if (QtNetworkSettings::hasIPv6()) { + PLATFORMSOCKETENGINE binder4; + QVERIFY(binder4.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv6Protocol)); + QVERIFY(binder4.bind(QHostAddress::AnyIPv6, 31180)); + + PLATFORMSOCKETENGINE binder5; + QVERIFY(binder5.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv6Protocol)); + QVERIFY(!binder5.bind(QHostAddress::AnyIPv6, 31180)); + QVERIFY(binder5.error() == QAbstractSocket::AddressInUseError); + } PLATFORMSOCKETENGINE binder6; QVERIFY(binder6.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::AnyIPProtocol)); diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index f730f67c1e..1d9ba55797 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -255,6 +255,8 @@ void tst_QTcpServer::clientServerLoop() //---------------------------------------------------------------------------------- void tst_QTcpServer::ipv6Server() { + if (!QtNetworkSettings::hasIPv6()) + QSKIP("system doesn't support ipv6!"); //### need to enter the event loop for the server to get the connection ?? ( windows) QTcpServer server; if (!server.listen(QHostAddress::LocalHostIPv6, 8944)) { @@ -295,6 +297,8 @@ void tst_QTcpServer::dualStack() QFETCH_GLOBAL(bool, setProxy); if (setProxy) QSKIP("test server proxy doesn't support ipv6"); + if (!QtNetworkSettings::hasIPv6()) + QSKIP("system doesn't support ipv6!"); QFETCH(QHostAddress, bindAddress); QFETCH(bool, v4ok); QFETCH(bool, v6ok); @@ -328,6 +332,9 @@ void tst_QTcpServer::ipv6ServerMapped() QVERIFY(server.waitForNewConnection(5000)); delete server.nextPendingConnection(); + if (!QtNetworkSettings::hasIPv6()) + QSKIP("system doesn't support ipv6!"); + // let's try the mapped one in the nice format QTcpSocket client2; client2.connectToHost("::ffff:127.0.0.1", server.serverPort()); @@ -814,9 +821,13 @@ void tst_QTcpServer::serverAddress_data() QTest::newRow("Any") << QHostAddress(QHostAddress::Any) << QHostAddress(QHostAddress::AnyIPv4); //windows XP doesn't support dual stack sockets else #endif - QTest::newRow("Any") << QHostAddress(QHostAddress::Any) << QHostAddress(QHostAddress::Any); + if (QtNetworkSettings::hasIPv6()) + QTest::newRow("Any") << QHostAddress(QHostAddress::Any) << QHostAddress(QHostAddress::Any); + else + QTest::newRow("Any") << QHostAddress(QHostAddress::Any) << QHostAddress(QHostAddress::AnyIPv4); QTest::newRow("AnyIPv4") << QHostAddress(QHostAddress::AnyIPv4) << QHostAddress(QHostAddress::AnyIPv4); - QTest::newRow("AnyIPv6") << QHostAddress(QHostAddress::AnyIPv6) << QHostAddress(QHostAddress::AnyIPv6); + if (QtNetworkSettings::hasIPv6()) + QTest::newRow("AnyIPv6") << QHostAddress(QHostAddress::AnyIPv6) << QHostAddress(QHostAddress::AnyIPv6); foreach (const QHostAddress& addr, QNetworkInterface::allAddresses()) { if (addr.isInSubnet(QHostAddress::parseSubnet("fe80::/10")) || addr.isInSubnet(QHostAddress::parseSubnet("169.254/16"))) @@ -850,6 +861,7 @@ void tst_QTcpServer::qtbug6305() return; QFETCH(QHostAddress, listenAddress); + QTcpServer server; QVERIFY2(server.listen(listenAddress), qPrintable(server.errorString())); diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp index 1196825708..edf37445fa 100644 --- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp +++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp @@ -450,10 +450,6 @@ void tst_QUdpSocket::dualStack() QByteArray v4Data("v4"); QVERIFY(v4Sock.bind(QHostAddress(QHostAddress::AnyIPv4), 0)); - QUdpSocket v6Sock; - QByteArray v6Data("v6"); - QVERIFY(v6Sock.bind(QHostAddress(QHostAddress::AnyIPv6), 0)); - QHostAddress from; quint16 port; QByteArray buffer; @@ -466,14 +462,29 @@ void tst_QUdpSocket::dualStack() buffer.resize(size); QCOMPARE(buffer, v4Data); - //test v6 -> dual - QCOMPARE((int)v6Sock.writeDatagram(v6Data.constData(), v6Data.length(), QHostAddress(QHostAddress::LocalHostIPv6), dualSock.localPort()), v6Data.length()); - QVERIFY(dualSock.waitForReadyRead(5000)); - buffer.reserve(100); - size = dualSock.readDatagram(buffer.data(), 100, &from, &port); - QCOMPARE((int)size, v6Data.length()); - buffer.resize(size); - QCOMPARE(buffer, v6Data); + if (QtNetworkSettings::hasIPv6()) { + QUdpSocket v6Sock; + QByteArray v6Data("v6"); + QVERIFY(v6Sock.bind(QHostAddress(QHostAddress::AnyIPv6), 0)); + + //test v6 -> dual + QCOMPARE((int)v6Sock.writeDatagram(v6Data.constData(), v6Data.length(), QHostAddress(QHostAddress::LocalHostIPv6), dualSock.localPort()), v6Data.length()); + QVERIFY(dualSock.waitForReadyRead(5000)); + buffer.reserve(100); + size = dualSock.readDatagram(buffer.data(), 100, &from, &port); + QCOMPARE((int)size, v6Data.length()); + buffer.resize(size); + QCOMPARE(buffer, v6Data); + + //test dual -> v6 + QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.length(), QHostAddress(QHostAddress::LocalHostIPv6), v6Sock.localPort()), dualData.length()); + QVERIFY(v6Sock.waitForReadyRead(5000)); + buffer.reserve(100); + size = v6Sock.readDatagram(buffer.data(), 100, &from, &port); + QCOMPARE((int)size, dualData.length()); + buffer.resize(size); + QCOMPARE(buffer, dualData); + } //test dual -> v4 QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.length(), QHostAddress(QHostAddress::LocalHost), v4Sock.localPort()), dualData.length()); @@ -483,16 +494,6 @@ void tst_QUdpSocket::dualStack() QCOMPARE((int)size, dualData.length()); buffer.resize(size); QCOMPARE(buffer, dualData); - - //test dual -> v6 - QCOMPARE((int)dualSock.writeDatagram(dualData.constData(), dualData.length(), QHostAddress(QHostAddress::LocalHostIPv6), v6Sock.localPort()), dualData.length()); - QVERIFY(v6Sock.waitForReadyRead(5000)); - buffer.reserve(100); - size = v6Sock.readDatagram(buffer.data(), 100, &from, &port); - QCOMPARE((int)size, dualData.length()); - buffer.resize(size); - QCOMPARE(buffer, dualData); - } void tst_QUdpSocket::dualStackAutoBinding() @@ -500,6 +501,8 @@ void tst_QUdpSocket::dualStackAutoBinding() QFETCH_GLOBAL(bool, setProxy); if (setProxy) QSKIP("test server SOCKS proxy doesn't support IPv6"); + if (!QtNetworkSettings::hasIPv6()) + QSKIP("system doesn't support ipv6!"); QUdpSocket v4Sock; QVERIFY(v4Sock.bind(QHostAddress(QHostAddress::AnyIPv4), 0)); @@ -560,6 +563,8 @@ void tst_QUdpSocket::dualStackNoIPv4onV6only() QFETCH_GLOBAL(bool, setProxy); if (setProxy) QSKIP("test server SOCKS proxy doesn't support IPv6"); + if (!QtNetworkSettings::hasIPv6()) + QSKIP("system doesn't support ipv6!"); QUdpSocket v4Sock; QVERIFY(v4Sock.bind(QHostAddress(QHostAddress::AnyIPv4), 0)); QByteArray v4Data("v4"); @@ -1145,6 +1150,8 @@ void tst_QUdpSocket::multicastLeaveAfterClose() QFETCH(QHostAddress, groupAddress); if (setProxy) QSKIP("UDP Multicast does not work with proxies"); + if (groupAddress.protocol() == QAbstractSocket::IPv6Protocol) + QSKIP("system doesn't support ipv6!"); QUdpSocket udpSocket; #ifdef FORCE_SESSION @@ -1228,6 +1235,8 @@ void tst_QUdpSocket::multicast() QFETCH(bool, bindResult); QFETCH(QHostAddress, groupAddress); QFETCH(bool, joinResult); + if (groupAddress.protocol() == QAbstractSocket::IPv6Protocol) + QSKIP("system doesn't support ipv6!"); if (setProxy) { // UDP multicast does not work with proxies if ( |