diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2017-03-18 14:45:35 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-04-15 10:36:55 +0200 |
| commit | d38eadd9907b216da12b2dc5bafe7a1b4ad07003 (patch) | |
| tree | c9b86c15387acbf5adca299d64f0c4b9f459ae8c /src/supplicant/nm-supplicant-interface.c | |
| parent | 8b051bb35e38e468d630431f1f5215a71d6049f6 (diff) | |
| download | NetworkManager-d38eadd9907b216da12b2dc5bafe7a1b4ad07003.tar.gz | |
supplicant: enable PMF based on driver type
Instead of adding a new flag to configuration based on connection
type, use the driver-type field directly in the supplicant-interface.
Diffstat (limited to 'src/supplicant/nm-supplicant-interface.c')
| -rw-r--r-- | src/supplicant/nm-supplicant-interface.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c index fc25a414dc..dbdee193da 100644 --- a/src/supplicant/nm-supplicant-interface.c +++ b/src/supplicant/nm-supplicant-interface.c @@ -487,15 +487,11 @@ set_pmf_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) if (!reply) { g_dbus_error_strip_remote_error (error); - _LOGW ("couldn't send PMF mode to the supplicant interface: %s", - error->message); - emit_error_helper (self, error); + _LOGW ("couldn't enable PMF: %s", error->message); return; } - _LOGI ("config: set interface pmf to %d", - nm_supplicant_config_get_pmf (priv->cfg)); - + _LOGD ("PMF enabled"); } gboolean @@ -812,7 +808,7 @@ on_iface_proxy_acquired (GDBusProxy *proxy, GAsyncResult *result, gpointer user_ /* Scan result aging parameters */ g_dbus_proxy_call (priv->iface_proxy, - "org.freedesktop.DBus.Properties.Set", + DBUS_INTERFACE_PROPERTIES ".Set", g_variant_new ("(ssv)", WPAS_DBUS_IFACE_INTERFACE, "BSSExpireAge", @@ -823,7 +819,7 @@ on_iface_proxy_acquired (GDBusProxy *proxy, GAsyncResult *result, gpointer user_ NULL, NULL); g_dbus_proxy_call (priv->iface_proxy, - "org.freedesktop.DBus.Properties.Set", + DBUS_INTERFACE_PROPERTIES ".Set", g_variant_new ("(ssv)", WPAS_DBUS_IFACE_INTERFACE, "BSSExpireCount", @@ -834,6 +830,20 @@ on_iface_proxy_acquired (GDBusProxy *proxy, GAsyncResult *result, gpointer user_ NULL, NULL); + if (priv->driver == NM_SUPPLICANT_DRIVER_WIRELESS) { + g_dbus_proxy_call (priv->iface_proxy, + DBUS_INTERFACE_PROPERTIES ".Set", + g_variant_new ("(ssv)", + WPAS_DBUS_IFACE_INTERFACE, + "Pmf", + g_variant_new_uint32 (1)), + G_DBUS_CALL_FLAGS_NONE, + -1, + priv->init_cancellable, + (GAsyncReadyCallback) set_pmf_cb, + self); + } + /* Check whether NetworkReply and AP mode are supported */ priv->ready_count = 1; g_dbus_proxy_call (priv->iface_proxy, @@ -863,17 +873,6 @@ on_iface_proxy_acquired (GDBusProxy *proxy, GAsyncResult *result, gpointer user_ priv->init_cancellable, (GAsyncReadyCallback) iface_introspect_cb, self); - g_dbus_proxy_call (priv->iface_proxy, - DBUS_INTERFACE_PROPERTIES ".Set", - g_variant_new ("(ssv)", - WPAS_DBUS_IFACE_INTERFACE, - "Pmf", - g_variant_new_uint32 (nm_supplicant_config_get_pmf (priv->cfg))), - G_DBUS_CALL_FLAGS_NONE, - -1, - priv->assoc_cancellable, - (GAsyncReadyCallback) set_pmf_cb, - self); } } |