smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: NetworkMonitor, short phyical using isPrivateUse()

Browse source 
this an Ip is considered private when its in a RFC1918 range
10/8, 172.16/12 and 192.168/16 are private IPs
This commit is contained in:
sithlord48 2025-12-31 07:48:22 -05:00 committed by Chris Rizzitello
parent a0f06d907f
commit a73057f3a7
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/lib/gui/core/NetworkMonitor.cpp
View file

@ -98,16 +98,11 @@ QList<QHostAddress> NetworkMonitor::getAvailableIPv4Addresses() const
} }
} }
auto physicalComparator = [](const QHostAddress &a, const QHostAddress &b) { std::sort(physicalIPs.begin(), physicalIPs.end(), [](const QHostAddress &a, const QHostAddress &b) {
static const auto localIpFilter = QStringLiteral("192.168/16"); if (a.isPrivateUse() != b.isPrivateUse())
if (a.isInSubnet(QHostAddress::parseSubnet(localIpFilter)) !=
b.isInSubnet(QHostAddress::parseSubnet(localIpFilter))) {
return true; return true;
}
return a.toIPv4Address() < b.toIPv4Address(); return a.toIPv4Address() < b.toIPv4Address();
}; });
std::sort(physicalIPs.begin(), physicalIPs.end(), physicalComparator);
std::sort(virtualIPs.begin(), virtualIPs.end(), [](const QHostAddress &a, const QHostAddress &b) { std::sort(virtualIPs.begin(), virtualIPs.end(), [](const QHostAddress &a, const QHostAddress &b) {
return a.toIPv4Address() < b.toIPv4Address(); return a.toIPv4Address() < b.toIPv4Address();

2
src/lib/gui/core/NetworkMonitor.h
View file

@ -53,7 +53,7 @@ public:
QList<QHostAddress> getAvailableIPv4Addresses() const; QList<QHostAddress> getAvailableIPv4Addresses() const;
/** /**
* @brief Get recommended IP address (192.168.x.x preferred) * @brief Get recommended IP address (RFC-1918 addresses preferred)
* @return Recommended IP address, returns null if none available * @return Recommended IP address, returns null if none available
*/ */
QHostAddress getSuggestedIPv4Address() const; QHostAddress getSuggestedIPv4Address() const;