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

Fix bug ipv4 can not refresh sometimes after change the configuration of a connected wired network

This commit is contained in:
chenlelin 2020-09-24 14:15:33 +08:00
parent 60c4b067d8
commit fda20445fb
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/confform.cpp
View File

@ -280,6 +280,9 @@ void ConfForm::on_btnOk_clicked()
if (this->isActConf == true) {
// 如果是修改当前连接的网络，则修改设置后简略重连网络
//QString cmd = "/usr/share/kylin-nm/shell/connup.sh '" + ui->leName->text() + "'";
//QString connCmd = "nmcli connection up '" + ui->leName->text() + "'";
//system(connCmd.toUtf8().data());
kylindbus.connectWiredNet(ui->leName->text()); //reconnect this wired network
QString m_txt(tr("New settings already effective"));

48
src/kylin-dbus-interface.cpp
View File

@ -738,9 +738,55 @@ void KylinDBus::connectWiredNet(QString netName)
"/org/freedesktop/NetworkManager",
"org.freedesktop.NetworkManager",
QDBusConnection::systemBus() );
QDBusInterface interface( "org.freedesktop.NetworkManager",
"/org/freedesktop/NetworkManager",
"org.freedesktop.DBus.Properties",
QDBusConnection::systemBus() );
//获取已经连接了那些网络，及这些网络对应的网络类型(ethernet or wifi)
QDBusMessage result = interface.call("Get", "org.freedesktop.NetworkManager", "ActiveConnections");
QList<QVariant> outArgs = result.arguments();
QVariant first = outArgs.at(0);
QDBusVariant dbvFirst = first.value<QDBusVariant>();
QVariant vFirst = dbvFirst.variant();
QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
QDBusObjectPath connWiredPath;
QDBusObjectPath objPath;
dbusArgs.beginArray();
while (!dbusArgs.atEnd()) {
dbusArgs >> objPath;
QDBusInterface interfacePro( "org.freedesktop.NetworkManager",
objPath.path(),
"org.freedesktop.DBus.Properties",
QDBusConnection::systemBus() );
QDBusReply<QVariant> reply = interfacePro.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Type");
if (reply.value().toString() == "ethernet" || reply.value().toString() == "802-3-ethernet") {
//先获取已连接有线网络对应的设备路径
QDBusInterface interfaceConn( "org.freedesktop.NetworkManager",
objPath.path(),
"org.freedesktop.DBus.Properties",
QDBusConnection::systemBus() );
QDBusMessage replyConn = interfaceConn.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Devices");
QList<QVariant> outArgsIp4 = replyConn.arguments();
QVariant firstIp4 = outArgsIp4.at(0);
QDBusVariant dbvFirstIp4 = firstIp4.value<QDBusVariant>();
QVariant vFirstIp4 = dbvFirstIp4.variant();
const QDBusArgument &dbusArgIpv4 = vFirstIp4.value<QDBusArgument>();
QList<QDBusObjectPath> mDatasIpv4;
dbusArgIpv4 >> mDatasIpv4;
connWiredPath = mDatasIpv4.at(0);
//qDebug() << "xxxxxxxxxxxxxxxxxxxxxxxxxx" << mDatasIpv4.at(0).path();
}
}
dbusArgs.endArray();
QDBusReply<QDBusObjectPath> connectionReply = m_interface.call("ActivateConnection",
QVariant::fromValue(objNet),
QVariant::fromValue(wiredPath),
QVariant::fromValue(connWiredPath),
QVariant::fromValue(active_connection));
}
}