From a6600f5ae68bedcdc48826226f77a5326f2a2e66 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 22 Jan 2019 10:14:21 +0100 Subject: [PATCH] clients/secret-agent: reorder code in nm-secret-agent-simple.c --- clients/common/nm-secret-agent-simple.c | 150 +++++++++++++----------- clients/common/nm-secret-agent-simple.h | 39 +++--- 2 files changed, 98 insertions(+), 91 deletions(-) diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index 9fcf4200cd..f89d225902 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -31,26 +31,16 @@ #include "nm-default.h" +#include "nm-secret-agent-simple.h" + #include #include #include #include "nm-vpn-service-plugin.h" - #include "nm-vpn-helpers.h" -#include "nm-secret-agent-simple.h" -G_DEFINE_TYPE (NMSecretAgentSimple, nm_secret_agent_simple, NM_TYPE_SECRET_AGENT_OLD) - -#define NM_SECRET_AGENT_SIMPLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimplePrivate)) - -enum { - REQUEST_SECRETS, - - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = { 0 }; +/*****************************************************************************/ typedef struct { NMSecretAgentSimple *self; @@ -64,6 +54,14 @@ typedef struct { NMSecretAgentGetSecretsFlags flags; } NMSecretAgentSimpleRequest; +enum { + REQUEST_SECRETS, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + typedef struct { /* */ GHashTable *requests; @@ -72,6 +70,12 @@ typedef struct { gboolean enabled; } NMSecretAgentSimplePrivate; +G_DEFINE_TYPE (NMSecretAgentSimple, nm_secret_agent_simple, NM_TYPE_SECRET_AGENT_OLD) + +#define NM_SECRET_AGENT_SIMPLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimplePrivate)) + +/*****************************************************************************/ + static void nm_secret_agent_simple_request_free (gpointer data) { @@ -96,45 +100,7 @@ nm_secret_agent_simple_request_cancel (NMSecretAgentSimpleRequest *request, g_hash_table_remove (priv->requests, request->request_id); } -static void -nm_secret_agent_simple_init (NMSecretAgentSimple *agent) -{ - NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (agent); - - priv->requests = g_hash_table_new_full (nm_str_hash, g_str_equal, - g_free, nm_secret_agent_simple_request_free); -} - -static void -nm_secret_agent_simple_finalize (GObject *object) -{ - NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (object); - GError *error; - GHashTableIter iter; - gpointer key; - gpointer value; - - error = g_error_new (NM_SECRET_AGENT_ERROR, - NM_SECRET_AGENT_ERROR_AGENT_CANCELED, - "The secret agent is going away"); - - g_hash_table_iter_init (&iter, priv->requests); - while (g_hash_table_iter_next (&iter, &key, &value)) { - NMSecretAgentSimpleRequest *request = value; - - request->callback (NM_SECRET_AGENT_OLD (object), - request->connection, - NULL, error, - request->callback_data); - } - - g_hash_table_destroy (priv->requests); - g_error_free (error); - - g_free (priv->path); - - G_OBJECT_CLASS (nm_secret_agent_simple_parent_class)->finalize (object); -} +/*****************************************************************************/ static gboolean strv_has (char **haystack, @@ -1127,6 +1093,67 @@ nm_secret_agent_simple_enable (NMSecretAgentSimple *self, const char *path) g_list_free (requests); } +/*****************************************************************************/ + +static void +nm_secret_agent_simple_init (NMSecretAgentSimple *agent) +{ + NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (agent); + + priv->requests = g_hash_table_new_full (nm_str_hash, g_str_equal, + g_free, nm_secret_agent_simple_request_free); +} + +/** + * nm_secret_agent_simple_new: + * @name: the identifier of secret agent + * + * Creates a new #NMSecretAgentSimple. It does not serve any requests until + * nm_secret_agent_simple_enable() is called. + * + * Returns: a new #NMSecretAgentSimple if the agent creation is successful + * or %NULL in case of a failure. + */ +NMSecretAgentOld * +nm_secret_agent_simple_new (const char *name) +{ + return g_initable_new (NM_TYPE_SECRET_AGENT_SIMPLE, NULL, NULL, + NM_SECRET_AGENT_OLD_IDENTIFIER, name, + NM_SECRET_AGENT_OLD_CAPABILITIES, NM_SECRET_AGENT_CAPABILITY_VPN_HINTS, + NULL); +} + +static void +nm_secret_agent_simple_finalize (GObject *object) +{ + NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (object); + GError *error; + GHashTableIter iter; + gpointer key; + gpointer value; + + error = g_error_new (NM_SECRET_AGENT_ERROR, + NM_SECRET_AGENT_ERROR_AGENT_CANCELED, + "The secret agent is going away"); + + g_hash_table_iter_init (&iter, priv->requests); + while (g_hash_table_iter_next (&iter, &key, &value)) { + NMSecretAgentSimpleRequest *request = value; + + request->callback (NM_SECRET_AGENT_OLD (object), + request->connection, + NULL, error, + request->callback_data); + } + + g_hash_table_destroy (priv->requests); + g_error_free (error); + + g_free (priv->path); + + G_OBJECT_CLASS (nm_secret_agent_simple_parent_class)->finalize (object); +} + void nm_secret_agent_simple_class_init (NMSecretAgentSimpleClass *klass) { @@ -1174,22 +1201,3 @@ nm_secret_agent_simple_class_init (NMSecretAgentSimpleClass *klass) G_TYPE_STRING, /* prompt */ G_TYPE_PTR_ARRAY); } - -/** - * nm_secret_agent_simple_new: - * @name: the identifier of secret agent - * - * Creates a new #NMSecretAgentSimple. It does not serve any requests until - * nm_secret_agent_simple_enable() is called. - * - * Returns: a new #NMSecretAgentSimple if the agent creation is successful - * or %NULL in case of a failure. - */ -NMSecretAgentOld * -nm_secret_agent_simple_new (const char *name) -{ - return g_initable_new (NM_TYPE_SECRET_AGENT_SIMPLE, NULL, NULL, - NM_SECRET_AGENT_OLD_IDENTIFIER, name, - NM_SECRET_AGENT_OLD_CAPABILITIES, NM_SECRET_AGENT_CAPABILITY_VPN_HINTS, - NULL); -} diff --git a/clients/common/nm-secret-agent-simple.h b/clients/common/nm-secret-agent-simple.h index 529aaeaca9..0ad57a0531 100644 --- a/clients/common/nm-secret-agent-simple.h +++ b/clients/common/nm-secret-agent-simple.h @@ -21,26 +21,6 @@ #include "nm-secret-agent-old.h" -#define NM_TYPE_SECRET_AGENT_SIMPLE (nm_secret_agent_simple_get_type ()) -#define NM_SECRET_AGENT_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimple)) -#define NM_SECRET_AGENT_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass)) -#define NM_IS_SECRET_AGENT_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SECRET_AGENT_SIMPLE)) -#define NM_IS_SECRET_AGENT_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SECRET_AGENT_SIMPLE)) -#define NM_SECRET_AGENT_SIMPLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass)) - -/* Signals */ -#define NM_SECRET_AGENT_SIMPLE_REQUEST_SECRETS "request-secrets" - -typedef struct { - NMSecretAgentOld parent; - -} NMSecretAgentSimple; - -typedef struct { - NMSecretAgentOldClass parent; - -} NMSecretAgentSimpleClass; - typedef enum { NM_SECRET_AGENT_SECRET_TYPE_PROPERTY, NM_SECRET_AGENT_SECRET_TYPE_SECRET, @@ -60,6 +40,25 @@ typedef struct { #define NM_SECRET_AGENT_VPN_TYPE_OPENCONNECT NM_DBUS_INTERFACE".openconnect" +/*****************************************************************************/ + +#define NM_TYPE_SECRET_AGENT_SIMPLE (nm_secret_agent_simple_get_type ()) +#define NM_SECRET_AGENT_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimple)) +#define NM_SECRET_AGENT_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass)) +#define NM_IS_SECRET_AGENT_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SECRET_AGENT_SIMPLE)) +#define NM_IS_SECRET_AGENT_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SECRET_AGENT_SIMPLE)) +#define NM_SECRET_AGENT_SIMPLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass)) + +#define NM_SECRET_AGENT_SIMPLE_REQUEST_SECRETS "request-secrets" + +typedef struct { + NMSecretAgentOld parent; +} NMSecretAgentSimple; + +typedef struct { + NMSecretAgentOldClass parent; +} NMSecretAgentSimpleClass; + GType nm_secret_agent_simple_get_type (void); NMSecretAgentOld *nm_secret_agent_simple_new (const char *name);