Changeset View
Changeset View
Standalone View
Standalone View
libs/editor/connectioneditorbase.cpp
| Show First 20 Lines • Show All 47 Lines • ▼ Show 20 Line(s) | |||||
| 48 | #include <NetworkManagerQt/CdmaSetting> | 48 | #include <NetworkManagerQt/CdmaSetting> | ||
| 49 | #include <NetworkManagerQt/GenericTypes> | 49 | #include <NetworkManagerQt/GenericTypes> | ||
| 50 | #include <NetworkManagerQt/GsmSetting> | 50 | #include <NetworkManagerQt/GsmSetting> | ||
| 51 | #include <NetworkManagerQt/PppoeSetting> | 51 | #include <NetworkManagerQt/PppoeSetting> | ||
| 52 | #include <NetworkManagerQt/Settings> | 52 | #include <NetworkManagerQt/Settings> | ||
| 53 | #include <NetworkManagerQt/VpnSetting> | 53 | #include <NetworkManagerQt/VpnSetting> | ||
| 54 | #include <NetworkManagerQt/Utils> | 54 | #include <NetworkManagerQt/Utils> | ||
| 55 | #include <NetworkManagerQt/WirelessSetting> | 55 | #include <NetworkManagerQt/WirelessSetting> | ||
| 56 | #include <NetworkManagerQt/WirelessSecuritySetting> | ||||
| 56 | #include <NetworkManagerQt/WirelessDevice> | 57 | #include <NetworkManagerQt/WirelessDevice> | ||
| 57 | 58 | | |||
| 58 | #include <KIconLoader> | 59 | #include <KIconLoader> | ||
| 59 | #include <KLocalizedString> | 60 | #include <KLocalizedString> | ||
| 60 | #include <KNotification> | 61 | #include <KNotification> | ||
| 61 | #include <KServiceTypeTrader> | 62 | #include <KServiceTypeTrader> | ||
| 62 | #include <KUser> | 63 | #include <KUser> | ||
| 63 | 64 | | |||
| ▲ Show 20 Lines • Show All 76 Lines • ▼ Show 20 Line(s) | 102 | { | |||
| 140 | if (connectionSettings->connectionType() == NetworkManager::ConnectionSettings::Wireless) { | 141 | if (connectionSettings->connectionType() == NetworkManager::ConnectionSettings::Wireless) { | ||
| 141 | NetworkManager::WirelessSecuritySetting::Ptr securitySetting = connectionSettings->setting(NetworkManager::Setting::WirelessSecurity).staticCast<NetworkManager::WirelessSecuritySetting>(); | 142 | NetworkManager::WirelessSecuritySetting::Ptr securitySetting = connectionSettings->setting(NetworkManager::Setting::WirelessSecurity).staticCast<NetworkManager::WirelessSecuritySetting>(); | ||
| 142 | NetworkManager::WirelessSetting::Ptr wirelessSetting = connectionSettings->setting(NetworkManager::Setting::Wireless).staticCast<NetworkManager::WirelessSetting>(); | 143 | NetworkManager::WirelessSetting::Ptr wirelessSetting = connectionSettings->setting(NetworkManager::Setting::Wireless).staticCast<NetworkManager::WirelessSetting>(); | ||
| 143 | 144 | | |||
| 144 | if (securitySetting && wirelessSetting) { | 145 | if (securitySetting && wirelessSetting) { | ||
| 145 | if (securitySetting->keyMgmt() != NetworkManager::WirelessSecuritySetting::WirelessSecuritySetting::Unknown) { | 146 | if (securitySetting->keyMgmt() != NetworkManager::WirelessSecuritySetting::WirelessSecuritySetting::Unknown) { | ||
| 146 | wirelessSetting->setSecurity("802-11-wireless-security"); | 147 | wirelessSetting->setSecurity("802-11-wireless-security"); | ||
| 147 | } | 148 | } | ||
| 149 | | ||||
| 150 | if (securitySetting->keyMgmt() == NetworkManager::WirelessSecuritySetting::SAE && | ||||
| 151 | wirelessSetting->mode() == NetworkManager::WirelessSetting::Adhoc) { | ||||
| 152 | // Ad-Hoc settings as specified by the supplicant | ||||
| 153 | // Proto | ||||
| 154 | QList<NetworkManager::WirelessSecuritySetting::WpaProtocolVersion> protoVersions = securitySetting->proto(); | ||||
| 155 | protoVersions << NetworkManager::WirelessSecuritySetting::Rsn; | ||||
| 156 | securitySetting->setProto(protoVersions); | ||||
| 157 | // Pairwise | ||||
| 158 | QList<NetworkManager::WirelessSecuritySetting::WpaEncryptionCapabilities> pairwiseEncrypts = securitySetting->pairwise(); | ||||
| 159 | pairwiseEncrypts << NetworkManager::WirelessSecuritySetting::Ccmp; | ||||
| 160 | securitySetting->setPairwise(pairwiseEncrypts); | ||||
| 161 | // Group | ||||
| 162 | QList<NetworkManager::WirelessSecuritySetting::WpaEncryptionCapabilities> groupEncrypts = securitySetting->group(); | ||||
| 163 | groupEncrypts << NetworkManager::WirelessSecuritySetting::Ccmp; | ||||
| 164 | securitySetting->setGroup(groupEncrypts); | ||||
| 165 | } | ||||
| 148 | } | 166 | } | ||
| 149 | } | 167 | } | ||
| 150 | return connectionSettings->toMap(); | 168 | return connectionSettings->toMap(); | ||
| 151 | } | 169 | } | ||
| 152 | 170 | | |||
| 153 | bool ConnectionEditorBase::isInitialized() const | 171 | bool ConnectionEditorBase::isInitialized() const | ||
| 154 | { | 172 | { | ||
| 155 | return m_initialized; | 173 | return m_initialized; | ||
| ▲ Show 20 Lines • Show All 343 Lines • Show Last 20 Lines | |||||