GNOME.org
 

[network-manager-applet/rm-userset] agent: simplify VPN secrets requests

commit 25f08c7cd1c78f09e55d268e7c5c4d1b2f0d42a1
Author: Dan Williams <dcbw redhat com>
Date:   Tue Jan 18 20:13:34 2011 -0600

    agent: simplify VPN secrets requests
    
    Use the same structures and callback mechanism as normal secrets
    requests.

 src/applet-vpn-request.c |  192 ++++++++++++++++++++++++++--------------------
 src/applet-vpn-request.h |   33 +-------
 src/applet.c             |   46 ++---------
 src/applet.h             |    1 +
 4 files changed, 121 insertions(+), 151 deletions(-)
---
diff --git a/src/applet-vpn-request.c b/src/applet-vpn-request.c
index dbc4f94..e050b7e 100644
--- a/src/applet-vpn-request.c
+++ b/src/applet-vpn-request.c
@@ -29,6 +29,8 @@
 #include <glib.h>
 #include <unistd.h>
 
+#include <glib-object.h>
+
 #include "applet-vpn-request.h"
 #include "nma-marshal.h"
 #include <nm-connection.h>
@@ -36,6 +38,23 @@
 #include <nm-setting-vpn.h>
 #include <nm-secret-agent.h>
 
+#define APPLET_TYPE_VPN_REQUEST            (applet_vpn_request_get_type ())
+#define APPLET_VPN_REQUEST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), APPLET_TYPE_VPN_REQUEST, AppletVpnRequest))
+#define APPLET_VPN_REQUEST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), APPLET_TYPE_VPN_REQUEST, AppletVpnRequestClass))
+#define APPLET_IS_VPN_REQUEST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APPLET_TYPE_VPN_REQUEST))
+#define APPLET_IS_VPN_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), APPLET_TYPE_VPN_REQUEST))
+#define APPLET_VPN_REQUEST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), APPLET_TYPE_VPN_REQUEST, AppletVpnRequestClass))
+
+typedef struct {
+	GObject parent;
+} AppletVpnRequest;
+
+typedef struct {
+	GObjectClass parent;
+} AppletVpnRequestClass;
+
+GType applet_vpn_request_get_type (void);
+
 G_DEFINE_TYPE (AppletVpnRequest, applet_vpn_request, G_TYPE_OBJECT)
 
 #define APPLET_VPN_REQUEST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
@@ -45,7 +64,6 @@ G_DEFINE_TYPE (AppletVpnRequest, applet_vpn_request, G_TYPE_OBJECT)
 typedef struct {
 	gboolean disposed;
 
-	char *bin_path;
 	char *uuid;
 	char *id;
 	char *service_type;
@@ -61,14 +79,13 @@ typedef struct {
 	guint channel_eventid;
 } AppletVpnRequestPrivate;
 
-enum {
-	DONE,
-	LAST_SIGNAL
-};
-static guint signals[LAST_SIGNAL] = { 0 };
-
 /****************************************************************/
 
+typedef struct {
+	SecretsRequest req;
+	AppletVpnRequest *vpn;
+} VpnSecretsInfo;
+
 static void
 destroy_gvalue (gpointer data)
 {
@@ -81,7 +98,9 @@ destroy_gvalue (gpointer data)
 static void 
 child_finished_cb (GPid pid, gint status, gpointer user_data)
 {
-	AppletVpnRequest *self = APPLET_VPN_REQUEST (user_data);
+	SecretsRequest *req = user_data;
+	VpnSecretsInfo *info = (VpnSecretsInfo *) req;
+	AppletVpnRequest *self = info->vpn;
 	AppletVpnRequestPrivate *priv = APPLET_VPN_REQUEST_GET_PRIVATE (self);
 	GError *error = NULL;
 	GHashTable *settings = NULL;
@@ -118,17 +137,20 @@ child_finished_cb (GPid pid, gint status, gpointer user_data)
 		                     "%s.%d (%s): canceled", __FILE__, __LINE__, __func__);
 	}
 
-	/* Send secrets back to listeners */
-	g_signal_emit (self, signals[DONE], 0, error ? NULL : settings, error);
+	/* Complete the secrets request */
+	applet_secrets_request_complete (req, settings, error);
+	applet_secrets_request_free (req);
 
 	if (settings)
 		g_hash_table_destroy (settings);
+	g_clear_error (&error);
 }
 
 static gboolean 
 child_stdout_data_cb (GIOChannel *source, GIOCondition condition, gpointer user_data)
 {
-	AppletVpnRequest *self = APPLET_VPN_REQUEST (user_data);
+	VpnSecretsInfo *info = user_data;
+	AppletVpnRequest *self = info->vpn;
 	AppletVpnRequestPrivate *priv = APPLET_VPN_REQUEST_GET_PRIVATE (self);
 	const char buf[1] = { 0x01 };
 	char *str;
@@ -215,25 +237,44 @@ find_auth_dialog_binary (const char *service, GError **error)
 	return prog;
 }
 
-AppletVpnRequest *
-applet_vpn_request_new (NMConnection *connection, GError **error)
+static void
+free_vpn_secrets_info (SecretsRequest *req)
+{
+	VpnSecretsInfo *info = (VpnSecretsInfo *) req;
+
+	if (info->vpn)
+		g_object_unref (info->vpn);
+}
+
+size_t
+applet_vpn_request_get_secrets_size (void)
+{
+	return sizeof (VpnSecretsInfo);
+}
+
+gboolean
+applet_vpn_request_get_secrets (SecretsRequest *req, GError **error)
 {
-	AppletVpnRequest *self;
+	VpnSecretsInfo *info = (VpnSecretsInfo *) req;
 	AppletVpnRequestPrivate *priv;
 	NMSettingConnection *s_con;
 	NMSettingVPN *s_vpn;
 	const char *connection_type;
 	const char *service_type;
 	char *bin_path;
+	const char *argv[9] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+	gboolean success = FALSE;
+
+	applet_secrets_request_set_free_func (req, free_vpn_secrets_info);
 
-	s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
+	s_con = (NMSettingConnection *) nm_connection_get_setting (req->connection, NM_TYPE_SETTING_CONNECTION);
 	g_return_val_if_fail (s_con != NULL, FALSE);
 
 	connection_type = nm_setting_connection_get_connection_type (s_con);
 	g_return_val_if_fail (connection_type != NULL, FALSE);
 	g_return_val_if_fail (strcmp (connection_type, NM_SETTING_VPN_SETTING_NAME) == 0, FALSE);
 
-	s_vpn = NM_SETTING_VPN (nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN));
+	s_vpn = NM_SETTING_VPN (nm_connection_get_setting (req->connection, NM_TYPE_SETTING_VPN));
 	g_return_val_if_fail (s_vpn != NULL, FALSE);
 
 	service_type = nm_setting_vpn_get_service_type (s_vpn);
@@ -242,39 +283,29 @@ applet_vpn_request_new (NMConnection *connection, GError **error)
 	/* find the auth-dialog binary */
 	bin_path = find_auth_dialog_binary (service_type, error);
 	if (!bin_path)
-		return NULL;
-
-	self = (AppletVpnRequest *) g_object_new (APPLET_TYPE_VPN_REQUEST, NULL);
-	if (self) {
-		priv = APPLET_VPN_REQUEST_GET_PRIVATE (self);
-		priv->bin_path = g_strdup (bin_path);
-		priv->uuid = g_strdup (nm_setting_connection_get_uuid (s_con));
-		priv->id = g_strdup (nm_setting_connection_get_id (s_con));
-		priv->service_type = g_strdup (service_type);
+		return FALSE;
+
+	info->vpn = (AppletVpnRequest *) g_object_new (APPLET_TYPE_VPN_REQUEST, NULL);
+	if (!info->vpn) {
+		g_set_error_literal (error,
+		                     NM_SECRET_AGENT_ERROR,
+		                     NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
+		                     "Could not create VPN secrets request object");
+		g_free (bin_path);
+		return FALSE;
 	}
-	g_free (bin_path);
 
-	return self;
-}
+	priv = APPLET_VPN_REQUEST_GET_PRIVATE (info->vpn);
 
-gboolean
-applet_vpn_request_get_secrets (AppletVpnRequest *self,
-                                gboolean retry,
-                                GError **error)
-{
-	AppletVpnRequestPrivate *priv = APPLET_VPN_REQUEST_GET_PRIVATE (self);
-	gboolean success;
-	const char *argv[] =
-		{ priv->bin_path            /*"/usr/libexec/nm-vpnc-auth-dialog"*/, 
-		  "-u", priv->uuid          /*"2a5d52b5-95b4-4431-b96e-3dd46128f9a7"*/, 
-		  "-n", priv->id            /*"davidznet42"*/,
-		  "-s", priv->service_type  /*"org.freedesktop.vpnc"*/, 
-		  "-r",
-		  NULL
-		};
-
-	if (!retry)
-		argv[7] = NULL;
+	argv[0] = bin_path;
+	argv[1] = "-u";
+	argv[2] = nm_setting_connection_get_uuid (s_con);
+	argv[3] = "-n";
+	argv[4] = nm_setting_connection_get_id (s_con);
+	argv[5] = "-s";
+	argv[6] = service_type;
+	if (req->flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW)
+		argv[7] = "-r";
 
 	success = g_spawn_async_with_pipes (NULL,                       /* working_directory */
 	                                    (gchar **) argv,            /* argv */
@@ -289,13 +320,14 @@ applet_vpn_request_get_secrets (AppletVpnRequest *self,
 	                                    error);                     /* error */
 	if (success) {
 		/* catch when child is reaped */
-		priv->watch_id = g_child_watch_add (priv->pid, child_finished_cb, self);
+		priv->watch_id = g_child_watch_add (priv->pid, child_finished_cb, info);
 
 		/* listen to what child has to say */
 		priv->channel = g_io_channel_unix_new (priv->child_stdout);
-		priv->channel_eventid = g_io_add_watch (priv->channel, G_IO_IN, child_stdout_data_cb, self);
+		priv->channel_eventid = g_io_add_watch (priv->channel, G_IO_IN, child_stdout_data_cb, info);
 		g_io_channel_set_encoding (priv->channel, NULL, NULL);
 	}
+	g_free (bin_path);
 
 	return success;
 }
@@ -323,37 +355,38 @@ dispose (GObject *object)
 	AppletVpnRequest *self = APPLET_VPN_REQUEST (object);
 	AppletVpnRequestPrivate *priv = APPLET_VPN_REQUEST_GET_PRIVATE (self);
 
-	if (!priv->disposed) {
-		priv->disposed = TRUE;
-
-		g_free (priv->bin_path);
-		g_free (priv->uuid);
-		g_free (priv->id);
-		g_free (priv->service_type);
-
-		if (priv->watch_id)
-			g_source_remove (priv->watch_id);
-
-		if (priv->channel_eventid)
-			g_source_remove (priv->channel_eventid);
-		if (priv->channel)
-			g_io_channel_unref (priv->channel);
-
-		if (priv->pid) {
-			g_spawn_close_pid (priv->pid);
-			if (kill (priv->pid, SIGTERM) == 0)
-				g_timeout_add_seconds (2, ensure_killed, GINT_TO_POINTER (priv->pid));
-			else {
-				kill (priv->pid, SIGKILL);
-				/* ensure the child is reaped */
-				waitpid (priv->pid, NULL, 0);
-			}
-		}
+	if (priv->disposed)
+		goto done;
+
+	priv->disposed = TRUE;
+
+	g_free (priv->uuid);
+	g_free (priv->id);
+	g_free (priv->service_type);
+
+	if (priv->watch_id)
+		g_source_remove (priv->watch_id);
 
-		g_slist_foreach (priv->lines, (GFunc) g_free, NULL);
-		g_slist_free (priv->lines);
+	if (priv->channel_eventid)
+		g_source_remove (priv->channel_eventid);
+	if (priv->channel)
+		g_io_channel_unref (priv->channel);
+
+	if (priv->pid) {
+		g_spawn_close_pid (priv->pid);
+		if (kill (priv->pid, SIGTERM) == 0)
+			g_timeout_add_seconds (2, ensure_killed, GINT_TO_POINTER (priv->pid));
+		else {
+			kill (priv->pid, SIGKILL);
+			/* ensure the child is reaped */
+			waitpid (priv->pid, NULL, 0);
+		}
 	}
 
+	g_slist_foreach (priv->lines, (GFunc) g_free, NULL);
+	g_slist_free (priv->lines);
+
+done:
 	G_OBJECT_CLASS (applet_vpn_request_parent_class)->dispose (object);
 }
 
@@ -366,12 +399,5 @@ applet_vpn_request_class_init (AppletVpnRequestClass *req_class)
 
 	/* virtual methods */
 	object_class->dispose = dispose;
-
-	signals[DONE] =
-		g_signal_new ("done",
-					  G_OBJECT_CLASS_TYPE (req_class),
-					  G_SIGNAL_RUN_FIRST, 0, NULL, NULL,
-					  nma_marshal_VOID__POINTER_POINTER,
-					  G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 }
 
diff --git a/src/applet-vpn-request.h b/src/applet-vpn-request.h
index cf81ed7..eefa902 100644
--- a/src/applet-vpn-request.h
+++ b/src/applet-vpn-request.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /* NetworkManager Wireless Applet -- Display wireless access points and allow user control
  *
  * Dan Williams <dcbw redhat com>
@@ -22,37 +23,11 @@
 #ifndef APPLET_VPN_REQEUST_H
 #define APPLET_VPN_REQUEST_H
 
-#include <glib-object.h>
+#include "applet.h"
 
-#include <nm-connection.h>
+size_t applet_vpn_request_get_secrets_size (void);
 
-#define APPLET_TYPE_VPN_REQUEST            (applet_vpn_request_get_type ())
-#define APPLET_VPN_REQUEST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), APPLET_TYPE_VPN_REQUEST, AppletVpnRequest))
-#define APPLET_VPN_REQUEST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), APPLET_TYPE_VPN_REQUEST, AppletVpnRequestClass))
-#define APPLET_IS_VPN_REQUEST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APPLET_TYPE_VPN_REQUEST))
-#define APPLET_IS_VPN_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), APPLET_TYPE_VPN_REQUEST))
-#define APPLET_VPN_REQUEST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), APPLET_TYPE_VPN_REQUEST, AppletVpnRequestClass))
-
-typedef struct {
-	GObject parent;
-} AppletVpnRequest;
-
-typedef struct {
-	GObjectClass parent;
-
-	/* Signals */
-	void (*done) (AppletVpnRequest *self,
-	              GHashTable *secrets,
-	              GError *error);
-} AppletVpnRequestClass;
-
-GType applet_vpn_request_get_type (void);
-
-AppletVpnRequest *applet_vpn_request_new (NMConnection *connection, GError **error);
-
-gboolean applet_vpn_request_get_secrets (AppletVpnRequest *req,
-                                         gboolean retry,
-                                         GError **error);
+gboolean applet_vpn_request_get_secrets (SecretsRequest *req, GError **error);
 
 #endif  /* APPLET_VPN_REQUEST_H */
 
diff --git a/src/applet.c b/src/applet.c
index 1167282..a0bc6a7 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -2513,6 +2513,7 @@ applet_secrets_request_new (size_t totsize,
                             gpointer request_id,
                             const char *setting_name,
                             const char **hints,
+                            guint32 flags,
                             AppletAgentSecretsCallback callback,
                             gpointer callback_data,
                             NMApplet *applet)
@@ -2528,6 +2529,7 @@ applet_secrets_request_new (size_t totsize,
 	req->reqid = request_id;
 	req->setting_name = g_strdup (setting_name);
 	req->hints = g_strdupv ((char **) hints);
+	req->flags = flags;
 	req->callback = callback;
 	req->callback_data = callback_data;
 	req->applet = applet;
@@ -2606,32 +2608,6 @@ applet_secrets_request_free (SecretsRequest *req)
 	g_free (req);
 }
 
-typedef struct {
-	SecretsRequest req;
-	AppletVpnRequest *vpn;
-} VpnSecretsRequest;
-
-static void
-vpn_request_done_cb (AppletVpnRequest *foo,
-                     GHashTable *settings,
-                     GError *error,
-                     gpointer user_data)
-{
-	SecretsRequest *req = user_data;
-
-	applet_secrets_request_complete (req, settings, error);
-	applet_secrets_request_free (req);
-}
-
-static void
-vpn_request_free_cb (SecretsRequest *req)
-{
-	VpnSecretsRequest *vpn_req = (VpnSecretsRequest *) req;
-
-	if (vpn_req->vpn)
-		g_object_unref (vpn_req->vpn);
-}
-
 static void
 get_existing_secrets_cb (NMSecretAgent *agent,
                          NMConnection *connection,
@@ -2681,28 +2657,19 @@ applet_agent_get_secrets_cb (AppletAgent *agent,
 
 	/* VPN secrets get handled a bit differently */
 	if (!strcmp (nm_setting_connection_get_connection_type (s_con), NM_SETTING_VPN_SETTING_NAME)) {
-		VpnSecretsRequest *vpnreq;
-
-		req = applet_secrets_request_new (sizeof (VpnSecretsRequest),
+		req = applet_secrets_request_new (applet_vpn_request_get_secrets_size (),
 		                                  connection,
 		                                  request_id,
 		                                  setting_name,
 		                                  hints,
+		                                  flags,
 		                                  callback,
 		                                  callback_data,
 		                                  applet);
-		applet_secrets_request_set_free_func (req, vpn_request_free_cb);
-
-		vpnreq = (VpnSecretsRequest *) req;
-		vpnreq->vpn = applet_vpn_request_new (connection, &error);
-		if (!vpnreq->vpn)
-			goto error;
-		if (!applet_vpn_request_get_secrets (vpnreq->vpn, !!flags, &error))
+		if (!applet_vpn_request_get_secrets (req, &error))
 			goto error;
 
-		/* Track this VPN password request */
-		g_signal_connect (vpnreq->vpn, "done", G_CALLBACK (vpn_request_done_cb), vpnreq);
-		applet->secrets_reqs = g_slist_prepend (applet->secrets_reqs, vpnreq);
+		applet->secrets_reqs = g_slist_prepend (applet->secrets_reqs, req);
 		return;
 	}
 
@@ -2729,6 +2696,7 @@ applet_agent_get_secrets_cb (AppletAgent *agent,
 	                                  request_id,
 	                                  setting_name,
 	                                  hints,
+	                                  flags,
 	                                  callback,
 	                                  callback_data,
 	                                  applet);
diff --git a/src/applet.h b/src/applet.h
index 569cd72..7c1aa13 100644
--- a/src/applet.h
+++ b/src/applet.h
@@ -181,6 +181,7 @@ struct _SecretsRequest {
 	gpointer reqid;
 	char *setting_name;
 	char **hints;
+	guint32 flags;
 	NMApplet *applet;
 	AppletAgentSecretsCallback callback;
 	gpointer callback_data;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]