ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #686: NetworkManager: add wireless device capabilities

pull/691/head
jenkins 2024-12-20 13:39:06 +01:00
parent 9127829a6c f013619a45
commit 482f64f3ab
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libnymea-core/jsonrpc/networkmanagerhandler.cpp
View File

@ -90,6 +90,7 @@ NetworkManagerHandler::NetworkManagerHandler(NetworkManager *networkManager, QOb
registerEnum<NetworkManager::NetworkManagerError>(); registerEnum<NetworkManager::NetworkManagerError>();
registerEnum<NetworkManager::NetworkManagerState>(); registerEnum<NetworkManager::NetworkManagerState>();
registerEnum<NetworkDevice::NetworkDeviceState>(); registerEnum<NetworkDevice::NetworkDeviceState>();
registerFlag<WirelessNetworkDevice::WirelessCapability, WirelessNetworkDevice::WirelessCapabilities>();
registerEnum<WirelessNetworkDevice::WirelessMode>(); registerEnum<WirelessNetworkDevice::WirelessMode>();
registerEnum<WiredNetworkConnectionType>(); registerEnum<WiredNetworkConnectionType>();
@ -119,6 +120,7 @@ NetworkManagerHandler::NetworkManagerHandler(NetworkManager *networkManager, QOb
wirelessNetworkDevice.insert("r:ipv4Addresses", enumValueName(StringList)); wirelessNetworkDevice.insert("r:ipv4Addresses", enumValueName(StringList));
wirelessNetworkDevice.insert("r:ipv6Addresses", enumValueName(StringList)); wirelessNetworkDevice.insert("r:ipv6Addresses", enumValueName(StringList));
wirelessNetworkDevice.insert("r:state", enumRef<NetworkDevice::NetworkDeviceState>()); wirelessNetworkDevice.insert("r:state", enumRef<NetworkDevice::NetworkDeviceState>());
wirelessNetworkDevice.insert("r:capabilities", flagRef<WirelessNetworkDevice::WirelessCapabilities>());
wirelessNetworkDevice.insert("r:bitRate", enumValueName(String)); wirelessNetworkDevice.insert("r:bitRate", enumValueName(String));
wirelessNetworkDevice.insert("r:mode", enumRef<WirelessNetworkDevice::WirelessMode>()); wirelessNetworkDevice.insert("r:mode", enumRef<WirelessNetworkDevice::WirelessMode>());
wirelessNetworkDevice.insert("r:o:currentAccessPoint", objectRef<WirelessAccessPoint>()); wirelessNetworkDevice.insert("r:o:currentAccessPoint", objectRef<WirelessAccessPoint>());
@ -556,6 +558,7 @@ QVariantMap NetworkManagerHandler::packWirelessNetworkDevice(WirelessNetworkDevi
networkDeviceVariant.insert("ipv4Addresses", networkDevice->ipv4Addresses()); networkDeviceVariant.insert("ipv4Addresses", networkDevice->ipv4Addresses());
networkDeviceVariant.insert("ipv6Addresses", networkDevice->ipv6Addresses()); networkDeviceVariant.insert("ipv6Addresses", networkDevice->ipv6Addresses());
networkDeviceVariant.insert("state", networkDevice->deviceStateString()); networkDeviceVariant.insert("state", networkDevice->deviceStateString());
networkDeviceVariant.insert("capabilities", flagValueNames(networkDevice->wirelessCapabilities()));
networkDeviceVariant.insert("mode", enumValueName(networkDevice->wirelessMode())); networkDeviceVariant.insert("mode", enumValueName(networkDevice->wirelessMode()));
networkDeviceVariant.insert("bitRate", QString("%1 [Mb/s]").arg(QString::number(networkDevice->bitRate()))); networkDeviceVariant.insert("bitRate", QString("%1 [Mb/s]").arg(QString::number(networkDevice->bitRate())));
if (networkDevice->activeAccessPoint()) if (networkDevice->activeAccessPoint())

21
tests/auto/api.json
View File

@ -139,7 +139,8 @@
"NetworkManagerErrorWirelessConnectionFailed", "NetworkManagerErrorWirelessConnectionFailed",
"NetworkManagerErrorNetworkingDisabled", "NetworkManagerErrorNetworkingDisabled",
"NetworkManagerErrorNetworkManagerNotAvailable", "NetworkManagerErrorNetworkManagerNotAvailable",
"NetworkManagerErrorInvalidConfiguration" "NetworkManagerErrorInvalidConfiguration",
"NetworkManagerErrorUnsupportedFeature"
], ],
"NetworkManagerState": [ "NetworkManagerState": [
"NetworkManagerStateUnknown", "NetworkManagerStateUnknown",
@ -378,6 +379,20 @@
"WiredNetworkConnectionTypeManual", "WiredNetworkConnectionTypeManual",
"WiredNetworkConnectionTypeShared" "WiredNetworkConnectionTypeShared"
], ],
"WirelessCapability": [
"WirelessCapabilityNone",
"WirelessCapabilityCipherWEP40",
"WirelessCapabilityCipherWEP104",
"WirelessCapabilityCipherTKIP",
"WirelessCapabilityCipherCCMP",
"WirelessCapabilityWPA",
"WirelessCapabilityRSN",
"WirelessCapabilityAP",
"WirelessCapabilityAdHoc",
"WirelessCapabilityFreqValid",
"WirelessCapability2Ghz",
"WirelessCapability5Ghz"
],
"WirelessMode": [ "WirelessMode": [
"WirelessModeUnknown", "WirelessModeUnknown",
"WirelessModeAdhoc", "WirelessModeAdhoc",
@ -551,6 +566,9 @@
], ],
"PermissionScopes": [ "PermissionScopes": [
"$ref:PermissionScope" "$ref:PermissionScope"
],
"WirelessCapabilities": [
"$ref:WirelessCapability"
] ]
}, },
"methods": { "methods": {
@ -3272,6 +3290,7 @@
}, },
"WirelessNetworkDevice": { "WirelessNetworkDevice": {
"r:bitRate": "String", "r:bitRate": "String",
"r:capabilities": "$ref:WirelessCapabilities",
"r:interface": "String", "r:interface": "String",
"r:ipv4Addresses": "StringList", "r:ipv4Addresses": "StringList",
"r:ipv6Addresses": "StringList", "r:ipv6Addresses": "StringList",