fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-22 19:20:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

iwd: set Device.Powered during set_enable

Browse source 
Make sure .set_enabled uses the Device.Powered property to basically
bring the netdev UP and DOWN as I understand is expected by the
nm_device logic.

Device.Powered should generally reflect the UP state immediately but
just to avoid possible race conditions .is_available() will now return
a value that is an AND of the local "enabled" state and IWD's Powered
property.
This commit is contained in:
Andrew Zaborowski 2018-03-01 20:56:32 +01:00 • committed by Andrew Zaborowski
parent f172681048
commit 6571b576c4
1 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/devices/wifi/nm-device-iwd.c
View file

@ -789,17 +789,22 @@ is_available (NMDevice *device, NMDeviceCheckDevAvailableFlags flags)
{
NMDeviceIwd *self = NM_DEVICE_IWD (device);
NMDeviceIwdPrivate *priv = NM_DEVICE_IWD_GET_PRIVATE (self);
gs_unref_variant GVariant *value = NULL;
return priv->enabled && priv->dbus_obj;
if (!priv->enabled || !priv->dbus_obj)
return FALSE;
value = g_dbus_proxy_get_cached_property (priv->dbus_proxy, "Powered");
return g_variant_get_boolean (value);
}
static gboolean
get_autoconnect_allowed (NMDevice *device)
{
NMDeviceIwdPrivate *priv;
NMDeviceIwdPrivate *priv = NM_DEVICE_IWD_GET_PRIVATE (NM_DEVICE_IWD (device));
priv = NM_DEVICE_IWD_GET_PRIVATE (NM_DEVICE_IWD (device));
return priv->enabled && priv->dbus_obj && priv->can_connect;
return is_available (device, NM_DEVICE_CHECK_DEV_AVAILABLE_NONE)
&& priv->can_connect;
}
static gboolean
@ -1211,6 +1216,20 @@ failed:
NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED);
}
static void
set_powered (NMDeviceIwd *self, gboolean powered)
{
NMDeviceIwdPrivate *priv = NM_DEVICE_IWD_GET_PRIVATE (self);
g_dbus_proxy_call (priv->dbus_proxy,
"org.freedesktop.DBus.Properties.Set",
g_variant_new ("(ssv)", NM_IWD_DEVICE_INTERFACE,
"Powered",
g_variant_new ("b", powered)),
G_DBUS_CALL_FLAGS_NONE, 2000,
NULL, NULL, NULL);
}
/*****************************************************************************/
static NMActStageReturn
@ -1479,6 +1498,9 @@ set_enabled (NMDevice *device, gboolean enabled)
return;
}
if (priv->dbus_proxy)
set_powered (self, enabled);
if (enabled) {
if (state != NM_DEVICE_STATE_UNAVAILABLE)
_LOGW (LOGD_CORE, "not in expected unavailable state!");
@ -1677,6 +1699,14 @@ scanning_changed (NMDeviceIwd *self, gboolean new_scanning)
}
}
static void
powered_changed (NMDeviceIwd *self, gboolean new_powered)
{
nm_device_queue_recheck_available (NM_DEVICE (self),
NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE,
NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED);
}
static void
properties_changed (GDBusProxy *proxy, GVariant *changed_properties,
GStrv invalidate_properties, gpointer user_data)
@ -1694,6 +1724,9 @@ properties_changed (GDBusProxy *proxy, GVariant *changed_properties,
if (!strcmp (key, "Scanning"))
scanning_changed (self, g_variant_get_boolean (value));
if (!strcmp (key, "Powered"))
powered_changed (self, g_variant_get_boolean (value));
g_variant_unref (value);
}
@ -1744,11 +1777,13 @@ nm_device_iwd_set_dbus_object (NMDeviceIwd *self, GDBusObject *object)
g_signal_connect (priv->dbus_proxy, "g-properties-changed",
G_CALLBACK (properties_changed), self);
/* Call Disconnect to make sure IWD's autoconnect is disabled. We've
* most likely just brought the device UP so it would be in
* autoconnect by default.
set_powered (self, priv->enabled);
/* Call Disconnect to make sure IWD's autoconnect is disabled.
* Autoconnect is the default state after device is brought UP.
*/
send_disconnect (self);
if (priv->enabled)
send_disconnect (self);
}
gboolean