flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 21:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant checks in CNetworkUtils::getKnownLocalIpV4Addresses()

Browse Source 
refs #869
This commit is contained in:
Roland Winklmeier
2017-02-15 15:09:36 +01:00
committed by Mathew Sutcliffe
parent 7edd1bb621
commit 98b2061d3d
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackmisc/network/networkutils.cpp
View File

@@ -94,17 +94,14 @@ namespace BlackMisc
QStringList CNetworkUtils::getKnownLocalIpV4Addresses()
{
QStringList ips;
if (!CNetworkUtils::hasConnectedInterface(false)) {return ips; }
for (const QHostAddress &address : QNetworkInterface::allAddresses())
const QList<QHostAddress> allAddresses = QNetworkInterface::allAddresses();
for (const QHostAddress &address : allAddresses)
{
if (address.isLoopback() || address.isNull()) continue;
if (address.protocol() == QAbstractSocket::IPv4Protocol && address != QHostAddress(QHostAddress::LocalHost))
if (address.isNull()) { continue; }
if (address.protocol() == QAbstractSocket::IPv4Protocol)
{
QString a = address.toString();
if (CNetworkUtils::isValidIPv4Address(a))
{
ips.append(a);
}
ips.append(a);
}
}
ips.sort();

2
src/blackmisc/network/networkutils.h
View File

@@ -86,7 +86,7 @@ namespace BlackMisc
//! Can connect to URL?
static bool canConnect(const BlackMisc::Network::CUrl &url, int timeoutMs = getTimeoutMs());
//! Find out my IPv4 address, empty if not possible
//! Find out my IPv4 addresses including loopback, empty if not possible
static QStringList getKnownLocalIpV4Addresses();
//! Valid IPv4 address