1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QHostInfo: remove QProcess dependency

Browse Source 
Our ideal scenario was to run python to run its getnameinfo()... so just
use getnameinfo() directly. This also avoids the problem of Python not
being present and our falling back to nslookup.

Change-Id: I5dd50a1a7ca5424d9e7afffd17adfc830386306f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 7b981a4f1a60d8bda22f7f1d21cb2c72ec843ea0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2024-01-26 11:31:13 -08:00 committed by Qt Cherry-pick Bot
parent 672c1f87b0
commit 3ad47fadb9
1 changed files with 24 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
View File

@ -14,10 +14,10 @@
#include <qhostinfo.h> #include <qhostinfo.h>
#include "private/qhostinfo_p.h" #include "private/qhostinfo_p.h"
#include "private/qnativesocketengine_p.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QDebug> #include <QDebug>
#include <QProcess>
#include <QTcpServer> #include <QTcpServer>
#include <QTcpSocket> #include <QTcpSocket>
#include <QTest> #include <QTest>
@ -29,11 +29,18 @@
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
# include <qt_windows.h> # include <qt_windows.h>
# ifdef gai_strerror
# undef gai_strerror
# define gai_strerror gai_strerrorA
# endif
#else #else
# include <netdb.h> # include <netdb.h>
# include <sys/socket.h> # include <sys/socket.h>
# include <unistd.h> # include <unistd.h>
#endif #endif
#ifndef NI_MAXHOST
# define NI_MAXHOST 1025
#endif
#include "../../../network-settings.h" #include "../../../network-settings.h"
@ -356,62 +363,29 @@ void tst_QHostInfo::lookupConnectToLambda()
static QStringList reverseLookupHelper(const QString &ip) static QStringList reverseLookupHelper(const QString &ip)
{ {
QStringList results; QStringList results;
union qt_sockaddr {
sockaddr a;
sockaddr_in a4;
sockaddr_in6 a6;
} sa = {};
const QString pythonCode = QHostAddress addr(ip);
"import socket;" if (addr.isNull()) {
"import sys;" qWarning("Could not parse IP address: %ls", qUtf16Printable(ip));
"print (socket.getnameinfo((sys.argv[1], 0), 0)[0]);";
QList<QByteArray> lines;
QProcess python;
python.setProcessChannelMode(QProcess::ForwardedErrorChannel);
python.start("python3", QStringList() << QString("-c") << pythonCode << ip);
if (python.waitForFinished()) {
if (python.exitStatus() == QProcess::NormalExit && python.exitCode() == 0)
lines = python.readAllStandardOutput().split('\n');
for (QByteArray line : lines) {
if (!line.isEmpty())
results << line.trimmed();
}
if (!results.isEmpty())
return results; return results;
} }
qDebug() << "Python failed, falling back to nslookup"; // from qnativesocketengine_p.h:
QProcess lookup; QT_SOCKLEN_T len = setSockaddr(&sa.a, addr, /*port = */ 0);
lookup.setProcessChannelMode(QProcess::ForwardedErrorChannel);
lookup.start("nslookup", QStringList(ip));
if (!lookup.waitForFinished()) {
results << "nslookup failure";
qDebug() << "nslookup failure";
return results;
}
lines = lookup.readAllStandardOutput().split('\n');
QByteArray name; QByteArray name(NI_MAXHOST, Qt::Uninitialized);
int ni_flags = NI_NAMEREQD | NI_NUMERICSERV;
const QByteArray nameMarkerNix("name ="); if (int r = getnameinfo(&sa.a, len, name.data(), name.size(), nullptr, 0, ni_flags)) {
const QByteArray nameMarkerWin("Name:"); qWarning("Failed to reverse look up '%ls': %s", qUtf16Printable(ip), gai_strerror(r));
const QByteArray addressMarkerWin("Address:"); } else {
results << QString::fromLatin1(name, qstrnlen(name, name.size()));
for (QByteArray line : lines) {
int index = -1;
if ((index = line.indexOf(nameMarkerNix)) != -1) { // Linux and macOS
name = line.mid(index + nameMarkerNix.size()).chopped(1).trimmed();
results << name;
} else if (line.startsWith(nameMarkerWin)) { // Windows formatting
name = line.mid(line.lastIndexOf(" ")).trimmed();
} else if (line.startsWith(addressMarkerWin)) {
QByteArray address = line.mid(addressMarkerWin.size()).trimmed();
if (address == ip.toUtf8()) {
results << name;
}
}
} }
if (results.isEmpty()) {
qDebug() << "Failure to parse nslookup output: " << lines;
}
return results; return results;
} }