refactor: NetworkMonitor::validAddresses filter our based on humanreadable and add vEth for windows wsl to ignore list
This commit is contained in:
parent
fb60189078
commit
76353eceb3
1 changed files with 3 additions and 2 deletions
|
|
@ -19,7 +19,7 @@ bool NetworkMonitor::isVirtualInterface(const QString &interfaceName)
|
||||||
{
|
{
|
||||||
// Common virtual network interface patterns
|
// Common virtual network interface patterns
|
||||||
static const auto virtualRegEx = QRegularExpression(
|
static const auto virtualRegEx = QRegularExpression(
|
||||||
QStringLiteral("^vboxnet|vmnet|docker|virbr|veth|br\\-|tun|utun|awdl|p2p|llw|anpi|tap"),
|
QStringLiteral("^vboxnet|vmnet|docker|virbr|veth|br\\-|tun|utun|awdl|p2p|llw|anpi|tap|vEth"),
|
||||||
QRegularExpression::CaseInsensitiveOption
|
QRegularExpression::CaseInsensitiveOption
|
||||||
);
|
);
|
||||||
return virtualRegEx.match(interfaceName).hasMatch();
|
return virtualRegEx.match(interfaceName).hasMatch();
|
||||||
|
|
@ -68,7 +68,8 @@ QStringList NetworkMonitor::validAddresses() const
|
||||||
}
|
}
|
||||||
|
|
||||||
const bool isP2P = (interface.flags() & QNetworkInterface::IsPointToPoint);
|
const bool isP2P = (interface.flags() & QNetworkInterface::IsPointToPoint);
|
||||||
const bool isVirtual = isVirtualInterface(interface.name()) || isP2P;
|
const bool isVirtualType = interface.type() == QNetworkInterface::Virtual;
|
||||||
|
const bool isVirtual = isVirtualInterface(interface.humanReadableName()) || isP2P || isVirtualType;
|
||||||
const auto addressEntries = interface.addressEntries();
|
const auto addressEntries = interface.addressEntries();
|
||||||
|
|
||||||
for (const auto &entry : addressEntries) {
|
for (const auto &entry : addressEntries) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue