Skip to content

fix: [network] add network full support #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Nov 28, 2025
Merged

fix: [network] add network full support #555

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 55 additions & 19 deletions deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,32 @@
qCDebug(appLog) << "DeviceGenerator::generatorMonitorDevice end";
}

bool isValidLogicalName(const QString& logicalName)
{
if (logicalName.contains("p2p", Qt::CaseInsensitive))
return false;

QString addressFilePath = "/sys/class/net/" + logicalName;
QDir dir(addressFilePath);
if (dir.exists())
return true;

qCInfo(appLog) << dir << "not exist in /sys/class/net/";
return false;
}

bool isValidMAC(const QString& macAddress)
{
if (macAddress.contains("00:00:00:00:00:00", Qt::CaseInsensitive) || macAddress.contains("ff:ff:ff:ff:ff:ff", Qt::CaseInsensitive) || macAddress.isEmpty())
return false;

QRegularExpression macRegex("([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})");
if (!macRegex.match(macAddress).hasMatch())
return false;

return true;
}

void DeviceGenerator::generatorNetworkDevice()
{
bool hasWlan =false;
Expand All @@ -308,27 +334,18 @@
const QString &logicalNameLshw = (*it)["logical name"];
for (QList<DeviceNetwork *>::iterator itDevice = lstDevice.begin(); itDevice != lstDevice.end(); ++itDevice) {
const QString &macAddressLshw = (*it)["serial"];
if (logicalNameLshw.contains("p2p", Qt::CaseInsensitive))
if (!isValidLogicalName(logicalNameLshw))
continue;
if (logicalNameLshw.contains("wlan", Qt::CaseInsensitive) && hasWlan) //common sense: one PC only have 1 wlan device
continue;
if (macAddressLshw.contains("00:00:00:00:00:00", Qt::CaseInsensitive) || macAddressLshw.contains("ff:ff:ff:ff:ff:ff", Qt::CaseInsensitive) || macAddressLshw.isEmpty())
if (!isValidMAC(macAddressLshw))
continue;
// Regular expression for validating MAC address
QRegularExpression macRegex("([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})");
if (!macRegex.match(macAddressLshw).hasMatch())
if (logicalNameLshw.contains("wlan", Qt::CaseInsensitive) && hasWlan) //common sense: one PC only have 1 wlan device
continue;

QString addressFilePath = "/sys/class/net/" + logicalNameLshw;
QDir dir(addressFilePath);
if (dir.exists()) {
DeviceNetwork *device = new DeviceNetwork();
device->setInfoFromLshw(*it);
lstDevice.append(device);
if (logicalNameLshw.contains("wlan", Qt::CaseInsensitive))
hasWlan = true;
continue;
}
DeviceNetwork *device = new DeviceNetwork();
device->setInfoFromLshw(*it);
lstDevice.append(device);
if (logicalNameLshw.contains("wlan", Qt::CaseInsensitive))
hasWlan = true;
}
}

Expand All @@ -341,8 +358,9 @@
continue;
}

const QString &serialNumberHwinfo = (*it)["HW Address"];
const QString &macHwinfo = (*it)["Permanent HW Address"].isEmpty() ? (*it)["HW Address"] : (*it)["Permanent HW Address"];
const QString &logicalNameHwinfo = (*it)["Device File"];
bool hasMatchLogicalName = false;
for (QList<DeviceNetwork *>::iterator itDevice = lstDevice.begin(); itDevice != lstDevice.end(); ++itDevice) {
const QString &serialNumberLst = (*itDevice)->hwAddress();
const QString &logicalNameLst = (*itDevice)->logicalName();
Expand All @@ -353,13 +371,31 @@
(*itDevice)->setEnableValue(false);
}

} else if (serialNumberHwinfo == serialNumberLst || logicalNameHwinfo == logicalNameLst) {
} else if (macHwinfo == serialNumberLst || logicalNameHwinfo == logicalNameLst) {
(*itDevice)->setInfoFromHwinfo(*it);
hasMatchLogicalName = true;
} else {
(*itDevice)->setCanUninstall(false);
(*itDevice)->setForcedDisplay(true);
}
}
//first check it's valid, if LogicalName not exist but valid please add it .
if (!hasMatchLogicalName && isValidMAC(macHwinfo) && isValidLogicalName(logicalNameHwinfo)) {
if (!logicalNameHwinfo.contains("wlan", Qt::CaseInsensitive)) {//add wired net
DeviceNetwork *device = new DeviceNetwork();
device->setInfoFromHwinfo(*it);
lstDevice.append(device);
hasMatchLogicalName = true;

Check warning on line 388 in deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Variable 'hasMatchLogicalName' is assigned a value that is never used.
} else { //add wireless net
if (!hasWlan) { //common sense: one PC only have 1 wlan device
DeviceNetwork *device = new DeviceNetwork();
device->setInfoFromHwinfo(*it);
lstDevice.append(device);
hasMatchLogicalName = true;

Check warning on line 394 in deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Variable 'hasMatchLogicalName' is assigned a value that is never used.
hasWlan = true;
}
}
}
}

foreach (DeviceNetwork *device, lstDevice) {
Expand Down