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

解决几处Qlist使用不规范可能导致段错误的问题

This commit is contained in:
huanchuang 2021-04-27 15:01:05 +08:00
parent caccf96026
commit f1dbe5bda3
1 changed files with 73 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -558,29 +558,37 @@ void KylinDBus::getConnectNetIp(QString netUuid)
QDBusConnection::systemBus() ); QDBusConnection::systemBus() );
QDBusMessage replyIp4 = interfaceIp4.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Ip4Config"); QDBusMessage replyIp4 = interfaceIp4.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Ip4Config");
QList<QVariant> outArgsIp4 = replyIp4.arguments(); QList<QVariant> outArgsIp4 = replyIp4.arguments();
QVariant firstIp4 = outArgsIp4.at(0); if(false == outArgsIp4.isEmpty())
QDBusVariant dbvFirstIp4 = firstIp4.value<QDBusVariant>(); {
QVariant vFirstIp4 = dbvFirstIp4.variant(); QVariant firstIp4 = outArgsIp4.at(0);
QDBusObjectPath dbusPathIp4 = vFirstIp4.value<QDBusObjectPath>(); QDBusVariant dbvFirstIp4 = firstIp4.value<QDBusVariant>();
QVariant vFirstIp4 = dbvFirstIp4.variant();
QDBusObjectPath dbusPathIp4 = vFirstIp4.value<QDBusObjectPath>();
QDBusInterface interfaceIpv4( "org.freedesktop.NetworkManager", QDBusInterface interfaceIpv4( "org.freedesktop.NetworkManager",
dbusPathIp4.path(), dbusPathIp4.path(),
"org.freedesktop.DBus.Properties", "org.freedesktop.DBus.Properties",
QDBusConnection::systemBus() ); QDBusConnection::systemBus() );
QDBusMessage replyIpv4 = interfaceIpv4.call("Get", "org.freedesktop.NetworkManager.IP4Config", "AddressData"); QDBusMessage replyIpv4 = interfaceIpv4.call("Get", "org.freedesktop.NetworkManager.IP4Config", "AddressData");
QList<QVariant> outArgsIpv4 = replyIpv4.arguments(); QList<QVariant> outArgsIpv4 = replyIpv4.arguments();
QVariant firstIpv4 = outArgsIpv4.at(0); if(false == outArgsIpv4.isEmpty())
QDBusVariant dbvFirstIpv4 = firstIpv4.value<QDBusVariant>(); {
QVariant vFirstIpv4 = dbvFirstIpv4.variant(); QVariant firstIpv4 = outArgsIpv4.at(0);
QDBusVariant dbvFirstIpv4 = firstIpv4.value<QDBusVariant>();
QVariant vFirstIpv4 = dbvFirstIpv4.variant();
const QDBusArgument &dbusArgIpv4 = vFirstIpv4.value<QDBusArgument>(); const QDBusArgument &dbusArgIpv4 = vFirstIpv4.value<QDBusArgument>();
QList<QVariantMap> mDatasIpv4; QList<QVariantMap> mDatasIpv4;
dbusArgIpv4 >> mDatasIpv4; dbusArgIpv4 >> mDatasIpv4;
if(false == mDatasIpv4.isEmpty())
foreach (QVariantMap mDataIpv4, mDatasIpv4) { {
dbusActiveLanIpv4 = mDataIpv4.value("address").toString(); foreach (QVariantMap mDataIpv4, mDatasIpv4) {
break; dbusActiveLanIpv4 = mDataIpv4.value("address").toString();
break;
}
}
}
} }
//ipv6的路径信息和ip信息 //ipv6的路径信息和ip信息
@ -590,6 +598,9 @@ void KylinDBus::getConnectNetIp(QString netUuid)
QDBusConnection::systemBus() ); QDBusConnection::systemBus() );
QDBusMessage replyIp6 = interfaceIp6.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Ip6Config"); QDBusMessage replyIp6 = interfaceIp6.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Ip6Config");
QList<QVariant> outArgsIp6 = replyIp6.arguments(); QList<QVariant> outArgsIp6 = replyIp6.arguments();
if(outArgsIp6.isEmpty())
continue;
QVariant firstIp6 = outArgsIp6.at(0); QVariant firstIp6 = outArgsIp6.at(0);
QDBusVariant dbvFirstIp6 = firstIp6.value<QDBusVariant>(); QDBusVariant dbvFirstIp6 = firstIp6.value<QDBusVariant>();
QVariant vFirstIp6 = dbvFirstIp6.variant(); QVariant vFirstIp6 = dbvFirstIp6.variant();
@ -602,6 +613,9 @@ void KylinDBus::getConnectNetIp(QString netUuid)
QDBusMessage replyIpv6 = interfaceIpv6.call("Get", "org.freedesktop.NetworkManager.IP6Config", "AddressData"); QDBusMessage replyIpv6 = interfaceIpv6.call("Get", "org.freedesktop.NetworkManager.IP6Config", "AddressData");
QList<QVariant> outArgsIpv6 = replyIpv6.arguments(); QList<QVariant> outArgsIpv6 = replyIpv6.arguments();
if(outArgsIpv6.isEmpty())
continue;
QVariant firstIpv6 = outArgsIpv6.at(0); QVariant firstIpv6 = outArgsIpv6.at(0);
QDBusVariant dbvFirstIpv6 = firstIpv6.value<QDBusVariant>(); QDBusVariant dbvFirstIpv6 = firstIpv6.value<QDBusVariant>();
QVariant vFirstIpv6 = dbvFirstIpv6.variant(); QVariant vFirstIpv6 = dbvFirstIpv6.variant();
@ -609,6 +623,8 @@ void KylinDBus::getConnectNetIp(QString netUuid)
const QDBusArgument &dbusArgIpv6 = vFirstIpv6.value<QDBusArgument>(); const QDBusArgument &dbusArgIpv6 = vFirstIpv6.value<QDBusArgument>();
QList<QVariantMap> mDatasIpv6; QList<QVariantMap> mDatasIpv6;
dbusArgIpv6 >> mDatasIpv6; dbusArgIpv6 >> mDatasIpv6;
if(mDatasIpv6.isEmpty())
continue;
foreach (QVariantMap mDataIpv6, mDatasIpv6) { foreach (QVariantMap mDataIpv6, mDatasIpv6) {
dbusActiveLanIpv6 = mDataIpv6.value("address").toString(); dbusActiveLanIpv6 = mDataIpv6.value("address").toString();
@ -625,28 +641,36 @@ void KylinDBus::getConnectNetIp(QString netUuid)
QDBusConnection::systemBus() ); QDBusConnection::systemBus() );
QDBusMessage replyIp4 = interfaceIp4.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Ip4Config"); QDBusMessage replyIp4 = interfaceIp4.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Ip4Config");
QList<QVariant> outArgsIp4 = replyIp4.arguments(); QList<QVariant> outArgsIp4 = replyIp4.arguments();
QVariant firstIp4 = outArgsIp4.at(0); if(false == outArgsIp4.isEmpty())
QDBusVariant dbvFirstIp4 = firstIp4.value<QDBusVariant>(); {
QVariant vFirstIp4 = dbvFirstIp4.variant(); QVariant firstIp4 = outArgsIp4.at(0);
QDBusObjectPath dbusPathIp4 = vFirstIp4.value<QDBusObjectPath>(); QDBusVariant dbvFirstIp4 = firstIp4.value<QDBusVariant>();
QVariant vFirstIp4 = dbvFirstIp4.variant();
QDBusObjectPath dbusPathIp4 = vFirstIp4.value<QDBusObjectPath>();
QDBusInterface interfaceIpv4( "org.freedesktop.NetworkManager", QDBusInterface interfaceIpv4( "org.freedesktop.NetworkManager",
dbusPathIp4.path(), dbusPathIp4.path(),
"org.freedesktop.DBus.Properties", "org.freedesktop.DBus.Properties",
QDBusConnection::systemBus() ); QDBusConnection::systemBus() );
QDBusMessage replyIpv4 = interfaceIpv4.call("Get", "org.freedesktop.NetworkManager.IP4Config", "AddressData"); QDBusMessage replyIpv4 = interfaceIpv4.call("Get", "org.freedesktop.NetworkManager.IP4Config", "AddressData");
QList<QVariant> outArgsIpv4 = replyIpv4.arguments(); QList<QVariant> outArgsIpv4 = replyIpv4.arguments();
QVariant firstIpv4 = outArgsIpv4.at(0); if(false == outArgsIpv4.isEmpty())
QDBusVariant dbvFirstIpv4 = firstIpv4.value<QDBusVariant>(); {
QVariant vFirstIpv4 = dbvFirstIpv4.variant(); QVariant firstIpv4 = outArgsIpv4.at(0);
QDBusVariant dbvFirstIpv4 = firstIpv4.value<QDBusVariant>();
QVariant vFirstIpv4 = dbvFirstIpv4.variant();
const QDBusArgument &dbusArgIpv4 = vFirstIpv4.value<QDBusArgument>(); const QDBusArgument &dbusArgIpv4 = vFirstIpv4.value<QDBusArgument>();
QList<QVariantMap> mDatasIpv4; QList<QVariantMap> mDatasIpv4;
dbusArgIpv4 >> mDatasIpv4; dbusArgIpv4 >> mDatasIpv4;
if(false == mDatasIpv4.isEmpty())
foreach (QVariantMap mDataIpv4, mDatasIpv4) { {
dbusActiveWifiIpv4 = mDataIpv4.value("address").toString(); foreach (QVariantMap mDataIpv4, mDatasIpv4) {
dbusActiveWifiIpv4 = mDataIpv4.value("address").toString();
}
}
}
} }
//ipv6的路径信息和ip信息 //ipv6的路径信息和ip信息
@ -656,6 +680,8 @@ void KylinDBus::getConnectNetIp(QString netUuid)
QDBusConnection::systemBus() ); QDBusConnection::systemBus() );
QDBusMessage replyIp6 = interfaceIp6.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Ip6Config"); QDBusMessage replyIp6 = interfaceIp6.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Ip6Config");
QList<QVariant> outArgsIp6 = replyIp6.arguments(); QList<QVariant> outArgsIp6 = replyIp6.arguments();
if(outArgsIp6.isEmpty())
continue;
QVariant firstIp6 = outArgsIp6.at(0); QVariant firstIp6 = outArgsIp6.at(0);
QDBusVariant dbvFirstIp6 = firstIp6.value<QDBusVariant>(); QDBusVariant dbvFirstIp6 = firstIp6.value<QDBusVariant>();
QVariant vFirstIp6 = dbvFirstIp6.variant(); QVariant vFirstIp6 = dbvFirstIp6.variant();
@ -668,6 +694,8 @@ void KylinDBus::getConnectNetIp(QString netUuid)
QDBusMessage replyIpv6 = interfaceIpv6.call("Get", "org.freedesktop.NetworkManager.IP6Config", "AddressData"); QDBusMessage replyIpv6 = interfaceIpv6.call("Get", "org.freedesktop.NetworkManager.IP6Config", "AddressData");
QList<QVariant> outArgsIpv6 = replyIpv6.arguments(); QList<QVariant> outArgsIpv6 = replyIpv6.arguments();
if(outArgsIpv6.isEmpty())
continue;
QVariant firstIpv6 = outArgsIpv6.at(0); QVariant firstIpv6 = outArgsIpv6.at(0);
QDBusVariant dbvFirstIpv6 = firstIpv6.value<QDBusVariant>(); QDBusVariant dbvFirstIpv6 = firstIpv6.value<QDBusVariant>();
QVariant vFirstIpv6 = dbvFirstIpv6.variant(); QVariant vFirstIpv6 = dbvFirstIpv6.variant();
@ -675,7 +703,8 @@ void KylinDBus::getConnectNetIp(QString netUuid)
const QDBusArgument &dbusArgIpv6 = vFirstIpv6.value<QDBusArgument>(); const QDBusArgument &dbusArgIpv6 = vFirstIpv6.value<QDBusArgument>();
QList<QVariantMap> mDatasIpv6; QList<QVariantMap> mDatasIpv6;
dbusArgIpv6 >> mDatasIpv6; dbusArgIpv6 >> mDatasIpv6;
if(mDatasIpv6.isEmpty())
continue;
foreach (QVariantMap mDataIpv6, mDatasIpv6) { foreach (QVariantMap mDataIpv6, mDatasIpv6) {
dbusActiveWifiIpv6 = mDataIpv6.value("address").toString(); dbusActiveWifiIpv6 = mDataIpv6.value("address").toString();
} }
@ -1422,6 +1451,8 @@ QList<QString> KylinDBus::getAtiveWifiBSsidUuid(QStringList wifilist)
QDBusMessage resultConnection = interfaceInfo.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Connection"); QDBusMessage resultConnection = interfaceInfo.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Connection");
QList<QVariant> outArgsConnection = resultConnection.arguments(); QList<QVariant> outArgsConnection = resultConnection.arguments();
if(outArgsConnection.isEmpty())
continue;
QVariant firstConnection = outArgsConnection.at(0); QVariant firstConnection = outArgsConnection.at(0);
QDBusVariant dbvFirstConnection = firstConnection.value<QDBusVariant>(); QDBusVariant dbvFirstConnection = firstConnection.value<QDBusVariant>();
QVariant vFirstConnection = dbvFirstConnection.variant(); QVariant vFirstConnection = dbvFirstConnection.variant();
@ -1432,7 +1463,8 @@ QList<QString> KylinDBus::getAtiveWifiBSsidUuid(QStringList wifilist)
"org.freedesktop.NetworkManager.Settings.Connection", "org.freedesktop.NetworkManager.Settings.Connection",
QDBusConnection::systemBus()); QDBusConnection::systemBus());
QDBusMessage resultSet = interfaceSet.call("GetSettings"); QDBusMessage resultSet = interfaceSet.call("GetSettings");
if(resultSet.arguments().isEmpty())
continue;
const QDBusArgument &dbusArg1stSet = resultSet.arguments().at( 0 ).value<QDBusArgument>(); const QDBusArgument &dbusArg1stSet = resultSet.arguments().at( 0 ).value<QDBusArgument>();
QMap<QString,QMap<QString,QVariant>> mapSet; QMap<QString,QMap<QString,QVariant>> mapSet;
dbusArg1stSet >> mapSet; dbusArg1stSet >> mapSet;