fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 20:28:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

iwd: save secrets request invocation in request user_data

Browse source 
To improve the code logic and reduce space for bugs, don't save the
dbus invocation object as priv->secrets_request, instead move it to
the nm_act_request_get_secrets()'s user_data as we only need the
invocation object for exactly the life time of the request.  See
https://github.com/NetworkManager/NetworkManager/pull/139 for
discussion.
This commit is contained in:
Andrew Zaborowski 2018-06-21 01:30:04 +02:00 • committed by Thomas Haller
parent 0876332bae
commit ffd96edf76
1 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,7 +73,6 @@ typedef struct {
GCancellable * cancellable; GCancellable * cancellable;
NMDeviceWifiCapabilities capabilities; NMDeviceWifiCapabilities capabilities;
NMActRequestGetSecretsCallId *wifi_secrets_id; NMActRequestGetSecretsCallId *wifi_secrets_id;
GDBusMethodInvocation *secrets_request;
guint periodic_scan_id; guint periodic_scan_id;
bool enabled:1; bool enabled:1;
bool can_scan:1; bool can_scan:1;
@ -379,14 +378,6 @@ wifi_secrets_cancel (NMDeviceIwd *self)
if (priv->wifi_secrets_id) if (priv->wifi_secrets_id)
nm_act_request_cancel_secrets (NULL, priv->wifi_secrets_id); nm_act_request_cancel_secrets (NULL, priv->wifi_secrets_id);
nm_assert (!priv->wifi_secrets_id); nm_assert (!priv->wifi_secrets_id);
if (priv->secrets_request) {
g_dbus_method_invocation_return_error_literal (priv->secrets_request, NM_DEVICE_ERROR,
NM_DEVICE_ERROR_INVALID_CONNECTION,
"NM secrets request cancelled");
priv->secrets_request = NULL;
}
} }
static void static void
@ -1008,25 +999,31 @@ wifi_secrets_cb (NMActRequest *req,
GError *error, GError *error,
gpointer user_data) gpointer user_data)
{ {
NMDevice *device = user_data; NMDeviceIwd *self;
NMDeviceIwd *self = user_data;
NMDeviceIwdPrivate *priv; NMDeviceIwdPrivate *priv;
NMDevice *device;
NMSettingWirelessSecurity *s_wireless_sec; NMSettingWirelessSecurity *s_wireless_sec;
const gchar *psk; const gchar *psk;
GDBusMethodInvocation *invocation;
nm_utils_user_data_unpack (user_data, &self, &invocation);
g_return_if_fail (NM_IS_DEVICE_IWD (self)); g_return_if_fail (NM_IS_DEVICE_IWD (self));
g_return_if_fail (NM_IS_ACT_REQUEST (req));
priv = NM_DEVICE_IWD_GET_PRIVATE (self); priv = NM_DEVICE_IWD_GET_PRIVATE (self);
device = NM_DEVICE (self);
g_return_if_fail (priv->wifi_secrets_id == call_id); g_return_if_fail (priv->wifi_secrets_id == call_id);
priv->wifi_secrets_id = NULL; priv->wifi_secrets_id = NULL;
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
g_dbus_method_invocation_return_error_literal (invocation, NM_DEVICE_ERROR,
NM_DEVICE_ERROR_INVALID_CONNECTION,
"NM secrets request cancelled");
return; return;
}
g_return_if_fail (priv->secrets_request);
g_return_if_fail (req == nm_device_get_act_request (device)); g_return_if_fail (req == nm_device_get_act_request (device));
g_return_if_fail (nm_act_request_get_settings_connection (req) == s_connection); g_return_if_fail (nm_act_request_get_settings_connection (req) == s_connection);
@ -1049,21 +1046,17 @@ wifi_secrets_cb (NMActRequest *req,
_LOGD (LOGD_DEVICE | LOGD_WIFI, _LOGD (LOGD_DEVICE | LOGD_WIFI,
"Returning a new PSK to the IWD Agent"); "Returning a new PSK to the IWD Agent");
g_dbus_method_invocation_return_value (priv->secrets_request, g_dbus_method_invocation_return_value (invocation,
g_variant_new ("(s)", psk)); g_variant_new ("(s)", psk));
priv->secrets_request = NULL;
/* Change state back to what it was before NEED_AUTH */ /* Change state back to what it was before NEED_AUTH */
nm_device_state_changed (device, NM_DEVICE_STATE_CONFIG, NM_DEVICE_STATE_REASON_NONE); nm_device_state_changed (device, NM_DEVICE_STATE_CONFIG, NM_DEVICE_STATE_REASON_NONE);
return; return;
secrets_error: secrets_error:
if (priv->secrets_request) { g_dbus_method_invocation_return_error_literal (invocation, NM_DEVICE_ERROR,
g_dbus_method_invocation_return_error_literal (priv->secrets_request, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INVALID_CONNECTION,
NM_DEVICE_ERROR_INVALID_CONNECTION, "NM secrets request failed");
"NM secrets request failed");
priv->secrets_request = NULL;
}
nm_device_state_changed (device, nm_device_state_changed (device,
NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_FAILED,
@ -1075,7 +1068,8 @@ secrets_error:
static void static void
wifi_secrets_get_secrets (NMDeviceIwd *self, wifi_secrets_get_secrets (NMDeviceIwd *self,
const char *setting_name, const char *setting_name,
NMSecretAgentGetSecretsFlags flags) NMSecretAgentGetSecretsFlags flags,
GDBusMethodInvocation *invocation)
{ {
NMDeviceIwdPrivate *priv = NM_DEVICE_IWD_GET_PRIVATE (self); NMDeviceIwdPrivate *priv = NM_DEVICE_IWD_GET_PRIVATE (self);
NMActRequest *req; NMActRequest *req;
@ -1091,7 +1085,7 @@ wifi_secrets_get_secrets (NMDeviceIwd *self,
flags, flags,
NULL, NULL,
wifi_secrets_cb, wifi_secrets_cb,
self); nm_utils_user_data_pack (self, invocation));
} }
static void static void
@ -1731,7 +1725,6 @@ gboolean
nm_device_iwd_agent_psk_query (NMDeviceIwd *self, nm_device_iwd_agent_psk_query (NMDeviceIwd *self,
GDBusMethodInvocation *invocation) GDBusMethodInvocation *invocation)
{ {
NMDeviceIwdPrivate *priv = NM_DEVICE_IWD_GET_PRIVATE (self);
NMActRequest *req; NMActRequest *req;
NMSettingWirelessSecurity *s_wireless_sec; NMSettingWirelessSecurity *s_wireless_sec;
const gchar *psk; const gchar *psk;
@ -1759,9 +1752,9 @@ nm_device_iwd_agent_psk_query (NMDeviceIwd *self,
wifi_secrets_get_secrets (self, wifi_secrets_get_secrets (self,
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION
| NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW); | NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW,
invocation);
priv->secrets_request = invocation;
return TRUE; return TRUE;
} }