diff --git a/src/blackmisc/network/networkutils.cpp b/src/blackmisc/network/networkutils.cpp index da97be709..f2f6f75bc 100644 --- a/src/blackmisc/network/networkutils.cpp +++ b/src/blackmisc/network/networkutils.cpp @@ -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 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(); diff --git a/src/blackmisc/network/networkutils.h b/src/blackmisc/network/networkutils.h index 5610bee02..1c36b9aa8 100644 --- a/src/blackmisc/network/networkutils.h +++ b/src/blackmisc/network/networkutils.h @@ -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 diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp index 5e17d852c..3d3a4c59e 100644 --- a/src/swiftlauncher/swiftlauncher.cpp +++ b/src/swiftlauncher/swiftlauncher.cpp @@ -193,7 +193,6 @@ void CSwiftLauncher::loadAbout() void CSwiftLauncher::initDBusGui() { - ui->cb_DBusServerAddress->addItem("127.0.0.1"); ui->cb_DBusServerAddress->addItems(CNetworkUtils::getKnownLocalIpV4Addresses()); ui->cb_DBusServerAddress->setCurrentIndex(0);