openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '0117-dhcp' into 'dbus-interface' 

when set auto, clear iip info

See merge request kylin-desktop/kylin-nm!525
This commit is contained in:
赵 世旭 2022-03-15 03:46:35 +00:00
parent 222a46d455 954b1f484e
commit cd931b2957
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/backend/dbus-interface/kylinwiredconnectoperation.cpp
View File

@ -81,7 +81,29 @@ void KyWiredConnectOperation::updateWiredConnect(const QString &connectUuid, con
NetworkManager::ConnectionSettings::Ptr connectSettingPtr = connectPtr->settings(); NetworkManager::ConnectionSettings::Ptr connectSettingPtr = connectPtr->settings();
updateConnect(connectSettingPtr, connectSettingsInfo); updateConnect(connectSettingPtr, connectSettingsInfo);
connectPtr->update(connectSettingPtr->toMap()); NMVariantMapMap mapmap1 = connectSettingPtr->toMap();
if (mapmap1.contains("ipv4")) {
QVariantMap map1 = mapmap1.value(QLatin1String("ipv4"));
bool isAuto = false;
if (map1.contains("method") && map1["method"] == "auto") {
qDebug() << "[KyWiredConnectOperation] set ipv4 method auto, clear address-data && addresses && gateway";
isAuto = true;
}
if (isAuto) {
if (map1.contains("address-data")) {
map1.remove("address-data");
}
if (map1.contains("addresses")) {
map1.remove("addresses");
}
if (map1.contains("gateway")) {
map1.remove("gateway");
}
}
mapmap1["ipv4"] = map1;
}
connectPtr->update(mapmap1);
return ; return ;
} }