feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Consolidate port parsing methods

Browse Source 
Change-Id: I137e9faa2c5f18e9ade0e2c59d73811d682abf13
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-05-12 08:42:51 +02:00
parent f8d637dc71
commit 6ea8a76e44
6 changed files with 46 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/libs/utils/port.cpp
View File

@@ -25,8 +25,46 @@
#include "port.h"
#include "stringutils.h"
/*! \class Utils::Port
\brief The Port class implements a wrapper around a 16 bit port number
to be used in conjunction with IP addresses.
*/
namespace Utils {
QList<Port> Port::parseFromSedOutput(const QByteArray &output)
{
QList<Port> ports;
const QList<QByteArray> portStrings = output.split('\n');
for (const QByteArray &portString : portStrings) {
if (portString.size() != 4)
continue;
bool ok;
const Utils::Port port(portString.toInt(&ok, 16));
if (ok) {
if (!ports.contains(port))
ports << port;
} else {
qWarning("%s: Unexpected string '%s' is not a port.",
Q_FUNC_INFO, portString.data());
}
}
return ports;
}
QList<Port> Port::parseFromNetstatOutput(const QByteArray &output)
{
QList<Port> ports;
const QList<QByteArray> lines = output.split('\n');
for (const QByteArray &line : lines) {
const Port port(Utils::parseUsedPortFromNetstatOutput(line));
if (port.isValid() && !ports.contains(port))
ports.append(port);
}
return ports;
}
} // Utils

4
src/libs/utils/port.h
View File

@@ -29,6 +29,7 @@
#include "qtcassert.h"
#include <QMetaType>
#include <QList>
#include <QString>
#include <limits>
@@ -55,6 +56,9 @@ public:
QString toString() const { return QString::number(m_port); }
static QList<Port> parseFromSedOutput(const QByteArray &output);
static QList<Port> parseFromNetstatOutput(const QByteArray &output);
private:
int m_port = -1;
};

20
src/plugins/docker/dockerdevice.cpp
View File

@@ -62,7 +62,6 @@
#include <utils/processinterface.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/stringutils.h>
#include <utils/temporaryfile.h>
#include <utils/treemodel.h>
#include <utils/utilsicons.h>
@@ -587,24 +586,7 @@ PortsGatheringMethod DockerDevice::portsGatheringMethod() const
CommandLine::Raw};
},
[](const QByteArray &output) {
QList<Utils::Port> ports;
const QList<QByteArray> portStrings = output.split('\n');
for (const QByteArray &portString : portStrings) {
if (portString.size() != 4)
continue;
bool ok;
const Utils::Port port(portString.toInt(&ok, 16));
if (ok) {
if (!ports.contains(port))
ports << port;
} else {
qWarning("%s: Unexpected string '%s' is not a port.",
Q_FUNC_INFO, portString.data());
}
}
return ports;
}
&Port::parseFromSedOutput
};
};

12
src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
View File

@@ -39,7 +39,6 @@
#include <utils/hostosinfo.h>
#include <utils/portlist.h>
#include <utils/qtcprocess.h>
#include <utils/stringutils.h>
#include <utils/url.h>
#include <QCoreApplication>
@@ -139,16 +138,7 @@ PortsGatheringMethod DesktopDevice::portsGatheringMethod() const
return {};
},
[](const QByteArray &output) {
QList<Utils::Port> ports;
const QList<QByteArray> lines = output.split('\n');
for (const QByteArray &line : lines) {
const Port port(Utils::parseUsedPortFromNetstatOutput(line));
if (port.isValid() && !ports.contains(port))
ports.append(port);
}
return ports;
}
&Port::parseFromNetstatOutput
};
}

12
src/plugins/qnx/qnxdevice.cpp
View File

@@ -37,7 +37,6 @@
#include <utils/port.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/stringutils.h>
#include <QRegularExpression>
@@ -168,16 +167,7 @@ PortsGatheringMethod QnxDevice::portsGatheringMethod() const
return {filePath("netstat"), {"-na"}};
},
[](const QByteArray &output) {
QList<Utils::Port> ports;
const QList<QByteArray> lines = output.split('\n');
for (const QByteArray &line : lines) {
const Port port(Utils::parseUsedPortFromNetstatOutput(line));
if (port.isValid() && !ports.contains(port))
ports.append(port);
}
return ports;
}
&Port::parseFromNetstatOutput
};
}

19
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -1035,24 +1035,7 @@ PortsGatheringMethod LinuxDevice::portsGatheringMethod() const
CommandLine::Raw};
},
[](const QByteArray &output) {
QList<Utils::Port> ports;
const QList<QByteArray> portStrings = output.split('\n');
for (const QByteArray &portString : portStrings) {
if (portString.size() != 4)
continue;
bool ok;
const Utils::Port port(portString.toInt(&ok, 16));
if (ok) {
if (!ports.contains(port))
ports << port;
} else {
qWarning("%s: Unexpected string '%s' is not a port.",
Q_FUNC_INFO, portString.data());
}
}
return ports;
}
&Port::parseFromSedOutput
};
}