From 3590e2cc52bff35daf2d20fb59a075b4ca232d81 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 26 Aug 2023 08:37:54 -0700 Subject: [PATCH] tst_QNetworkInterface: enable IPv6 detection for Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was disabled in d0d1d7403377363a101d4f1781d06a9b44787d0a, I guess accidentally, by a too-wide conditional. The change the same commit applied to QtNetworkSettings didn't make the same mistake. I am also opportunistically updating the conditional to QT_CONFIG (I missed this in 9d4579c1cd0aae5f75c8702826b5d874a6aae83e) and adding the Linux-specific check, as the AF_NETLINK implementation does not rely on getifaddrs() or if_nametoindex(). Drive-by fix indentation. Change-Id: Ifa1111900d6945ea8e05fffd177ef8fcb11b4e1e Reviewed-by: Mårten Nordheim (cherry picked from commit 2e51fbf89a748ad3550e786f1bdbf623169550d2) Reviewed-by: Qt Cherry-pick Bot --- .../kernel/qnetworkinterface/CMakeLists.txt | 2 +- .../qnetworkinterface/tst_qnetworkinterface.cpp | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt b/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt index b06ef5c3d17..e7a1fec5255 100644 --- a/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt +++ b/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt @@ -9,6 +9,6 @@ qt_internal_add_test(tst_qnetworkinterface SOURCES tst_qnetworkinterface.cpp LIBRARIES - Qt::Network + Qt::NetworkPrivate QT_TEST_SERVER_LIST "apache2" ) diff --git a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp index db06b839408..74182dc7de7 100644 --- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp +++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp @@ -12,6 +12,8 @@ #include #include "../../../network-settings.h" +#include + Q_DECLARE_METATYPE(QHostAddress) class tst_QNetworkInterface : public QObject @@ -49,14 +51,13 @@ tst_QNetworkInterface::~tst_QNetworkInterface() bool tst_QNetworkInterface::isIPv6Working() { - // Version without following cannot get IPV6 information - #if !defined(QT_NO_GETIFADDRS) && !defined(QT_NO_IPV6IFNAME) - QUdpSocket socket; - socket.connectToHost(QHostAddress::LocalHostIPv6, 1234); - return socket.state() == QAbstractSocket::ConnectedState || socket.waitForConnected(100); - #else - return false; - #endif + // QNetworkInterface may be unable to detect IPv6 addresses even if they + // are there, due to limitations of the implementation. + if (QOperatingSystemVersion::currentType() == QOperatingSystemVersion::Windows || + QT_CONFIG(linux_netlink) || (QT_CONFIG(getifaddrs) && QT_CONFIG(ipv6ifname))) { + return QtNetworkSettings::hasIPv6(); + } + return false; } void tst_QNetworkInterface::initTestCase()