colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: branch 'lr/fix-iwd-1-0'

Browse Source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/325
This commit is contained in:
Lubomir Rintel
2019-11-03 08:54:56 +01:00
parent e1ead6fa98 186d22a963
commit c2ec79217a
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/devices/wifi/nm-iwd-manager.c
View File

@@ -136,6 +136,11 @@ agent_dbus_method_cb (GDBusConnection *connection,
network = g_dbus_object_manager_get_interface (priv->object_manager, network = g_dbus_object_manager_get_interface (priv->object_manager,
network_path, network_path,
NM_IWD_NETWORK_INTERFACE); NM_IWD_NETWORK_INTERFACE);
if (!network) {
_LOGE ("unable to find the network object");
return;
}
device_path = get_property_string_or_null (G_DBUS_PROXY (network), "Device"); device_path = get_property_string_or_null (G_DBUS_PROXY (network), "Device");
if (!device_path) { if (!device_path) {
@@ -257,9 +262,22 @@ register_agent (NMIwdManager *self)
GDBusInterface *agent_manager; GDBusInterface *agent_manager;
agent_manager = g_dbus_object_manager_get_interface (priv->object_manager, agent_manager = g_dbus_object_manager_get_interface (priv->object_manager,
"/", "/net/connman/iwd",
NM_IWD_AGENT_MANAGER_INTERFACE); NM_IWD_AGENT_MANAGER_INTERFACE);
if (!agent_manager) {
/* IWD prior to 1.0 dated 30 October, 2019 has the agent manager on a
* different path. */
agent_manager = g_dbus_object_manager_get_interface (priv->object_manager,
"/",
NM_IWD_AGENT_MANAGER_INTERFACE);
}
if (!agent_manager) {
_LOGE ("unable to register the IWD Agent: PSK/8021x Wi-Fi networks may not work");
return;
}
/* Register our agent */ /* Register our agent */
g_dbus_proxy_call (G_DBUS_PROXY (agent_manager), g_dbus_proxy_call (G_DBUS_PROXY (agent_manager),
"RegisterAgent", "RegisterAgent",