Attachment 899501 Details for Bug 1100979 – [PATCH] wifi: take reference to NMDeviceWifi before requesting secrets

[patch] [PATCH] wifi: take reference to NMDeviceWifi before requesting secrets

0001-wifi-take-reference-to-NMDeviceWifi-before-requestin.patch (text/plain), 2.68 KB, created by Thomas Haller on 2014-05-27 13:30:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Haller

Created: 2014-05-27 13:30:13 UTC

Size: 2.68 KB

patch

obsolete

>From 99bc30a78c07b1b89657c1993731bb5722382c2c Mon Sep 17 00:00:00 2001
>From: Thomas Haller <thaller@redhat.com>
>Date: Tue, 27 May 2014 15:25:27 +0200
>Subject: [PATCH 1/1] wifi: take reference to NMDeviceWifi before requesting
> secrets
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1100979
>
>Signed-off-by: Thomas Haller <thaller@redhat.com>
>---
> src/devices/wifi/nm-device-wifi.c | 29 ++++++++++++++++++++---------
> 1 file changed, 20 insertions(+), 9 deletions(-)
>
>diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
>index 24403ea..6aaceb0 100644
>--- a/src/devices/wifi/nm-device-wifi.c
>+++ b/src/devices/wifi/nm-device-wifi.c
>@@ -2036,14 +2036,12 @@ cleanup_association_attempt (NMDeviceWifi *self, gboolean disconnect)
> }
> 
> static void
>-wifi_secrets_cb (NMActRequest *req,
>-                 guint32 call_id,
>-                 NMConnection *connection,
>-                 GError *error,
>-                 gpointer user_data)
>+wifi_secrets_cb_handle (NMDevice *dev,
>+                        NMActRequest *req,
>+                        guint32 call_id,
>+                        NMConnection *connection,
>+                        GError *error)
> {
>-	NMDevice *dev = NM_DEVICE (user_data);
>-
> 	g_return_if_fail (req == nm_device_get_act_request (dev));
> 	g_return_if_fail (nm_device_get_state (dev) == NM_DEVICE_STATE_NEED_AUTH);
> 	g_return_if_fail (nm_act_request_get_connection (req) == connection);
>@@ -2057,6 +2055,19 @@ wifi_secrets_cb (NMActRequest *req,
> 		nm_device_activate_schedule_stage1_device_prepare (dev);
> }
> 
>+static void
>+wifi_secrets_cb (NMActRequest *req,
>+                 guint32 call_id,
>+                 NMConnection *connection,
>+                 GError *error,
>+                 gpointer user_data)
>+{
>+	NMDevice *dev = NM_DEVICE (user_data);
>+
>+	wifi_secrets_cb_handle (req, call_id, connection, dev);
>+	g_object_unref (dev);
>+}
>+
> /*
>  * link_timeout_cb
>  *
>@@ -2216,7 +2227,7 @@ handle_8021x_or_psk_auth_fail (NMDeviceWifi *self,
> 		                              | NM_SETTINGS_GET_SECRETS_FLAG_REQUEST_NEW,
> 		                            NULL,
> 		                            wifi_secrets_cb,
>-		                            self);
>+		                            g_object_ref (self));
> 		handled = TRUE;
> 	}
> 
>@@ -2445,7 +2456,7 @@ handle_auth_or_fail (NMDeviceWifi *self,
> 
> 		if (new_secrets)
> 			flags |= NM_SETTINGS_GET_SECRETS_FLAG_REQUEST_NEW;
>-		nm_act_request_get_secrets (req, setting_name, flags, NULL, wifi_secrets_cb, self);
>+		nm_act_request_get_secrets (req, setting_name, flags, NULL, wifi_secrets_cb, g_object_ref (self));
> 
> 		g_object_set_data (G_OBJECT (connection), WIRELESS_SECRETS_TRIES, GUINT_TO_POINTER (++tries));
> 		ret = NM_ACT_STAGE_RETURN_POSTPONE;
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1100979: 898976 | 898977 | 898978 | 898979 | 898980 | 898981 | 898982 | 898983 | 898984 | 898985 | 898986 | 899501