mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-11-05 19:03:31 +00:00
9fd98ef91b
Implement GInitable and GAsyncInitable in NMObject, with implementations that synchronously or asynchonously load all properties, and change _nm_object_ensure_inited() to run g_initable_init(). Update the object/object-array property handling to initialize the objects after creating them (synchronously or asynchronously, according to the situation), so that they will have all of their properties preloaded before they are ever visible to the caller. Move the non-blocking/non-failable parts of various objects' constructor() methods to constructed(), and move the blocking/failable parts to init(), and implement init_async() methods with non-blocking versions of the blocking methods. Make nm_device_new() and nm_client_new() call _nm_object_ensure_inited(), to preserve the behaviour formerly enforced by their construct() methods, that properties are guaranteed to be initialized before any signals involving them are emitted.
229 lines
6.1 KiB
C
229 lines
6.1 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/*
|
|
* libnm_glib -- Access network status & information from glib applications
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
* Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright (C) 2008 - 2011 Red Hat, Inc.
|
|
* Copyright (C) 2008 Novell, Inc.
|
|
*/
|
|
|
|
#include <string.h>
|
|
|
|
#include "nm-dhcp4-config.h"
|
|
#include "NetworkManager.h"
|
|
#include "nm-types-private.h"
|
|
#include "nm-object-private.h"
|
|
#include "nm-utils.h"
|
|
|
|
G_DEFINE_TYPE (NMDHCP4Config, nm_dhcp4_config, NM_TYPE_OBJECT)
|
|
|
|
#define NM_DHCP4_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP4_CONFIG, NMDHCP4ConfigPrivate))
|
|
|
|
typedef struct {
|
|
DBusGProxy *proxy;
|
|
|
|
GHashTable *options;
|
|
} NMDHCP4ConfigPrivate;
|
|
|
|
enum {
|
|
PROP_0,
|
|
PROP_OPTIONS,
|
|
|
|
LAST_PROP
|
|
};
|
|
|
|
static void
|
|
nm_dhcp4_config_init (NMDHCP4Config *config)
|
|
{
|
|
}
|
|
|
|
static void
|
|
copy_options (gpointer key, gpointer data, gpointer user_data)
|
|
{
|
|
GHashTable *options = (GHashTable *) user_data;
|
|
GValue *value = (GValue *) data;
|
|
|
|
g_hash_table_insert (options, g_strdup (key), g_value_dup_string (value));
|
|
}
|
|
|
|
static gboolean
|
|
demarshal_dhcp4_options (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field)
|
|
{
|
|
NMDHCP4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (object);
|
|
GHashTable *new_options;
|
|
|
|
g_hash_table_remove_all (priv->options);
|
|
|
|
new_options = g_value_get_boxed (value);
|
|
if (new_options)
|
|
g_hash_table_foreach (new_options, copy_options, priv->options);
|
|
|
|
_nm_object_queue_notify (object, NM_DHCP4_CONFIG_OPTIONS);
|
|
return TRUE;
|
|
}
|
|
|
|
static void
|
|
register_properties (NMDHCP4Config *config)
|
|
{
|
|
NMDHCP4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (config);
|
|
const NMPropertiesInfo property_info[] = {
|
|
{ NM_DHCP4_CONFIG_OPTIONS, &priv->options, demarshal_dhcp4_options },
|
|
{ NULL },
|
|
};
|
|
|
|
_nm_object_register_properties (NM_OBJECT (config),
|
|
priv->proxy,
|
|
property_info);
|
|
}
|
|
|
|
static void
|
|
constructed (GObject *object)
|
|
{
|
|
DBusGConnection *connection;
|
|
NMDHCP4ConfigPrivate *priv;
|
|
|
|
G_OBJECT_CLASS (nm_dhcp4_config_parent_class)->constructed (object);
|
|
|
|
priv = NM_DHCP4_CONFIG_GET_PRIVATE (object);
|
|
priv->options = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
|
|
|
|
connection = nm_object_get_connection (NM_OBJECT (object));
|
|
|
|
priv->proxy = dbus_g_proxy_new_for_name (connection,
|
|
NM_DBUS_SERVICE,
|
|
nm_object_get_path (NM_OBJECT (object)),
|
|
NM_DBUS_INTERFACE_DHCP4_CONFIG);
|
|
|
|
register_properties (NM_DHCP4_CONFIG (object));
|
|
}
|
|
|
|
static void
|
|
finalize (GObject *object)
|
|
{
|
|
NMDHCP4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (object);
|
|
|
|
if (priv->options)
|
|
g_hash_table_destroy (priv->options);
|
|
|
|
g_object_unref (priv->proxy);
|
|
|
|
G_OBJECT_CLASS (nm_dhcp4_config_parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
get_property (GObject *object,
|
|
guint prop_id,
|
|
GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
NMDHCP4Config *self = NM_DHCP4_CONFIG (object);
|
|
|
|
switch (prop_id) {
|
|
case PROP_OPTIONS:
|
|
g_value_set_boxed (value, nm_dhcp4_config_get_options (self));
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
nm_dhcp4_config_class_init (NMDHCP4ConfigClass *config_class)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (config_class);
|
|
|
|
g_type_class_add_private (config_class, sizeof (NMDHCP4ConfigPrivate));
|
|
|
|
/* virtual methods */
|
|
object_class->constructed = constructed;
|
|
object_class->get_property = get_property;
|
|
object_class->finalize = finalize;
|
|
|
|
/* properties */
|
|
|
|
/**
|
|
* NMDHCP4Config:options:
|
|
*
|
|
* The #GHashTable containing options of the configuration.
|
|
*
|
|
* Type: GLib.HashTable
|
|
* Element-Type: utf8,GObject.Value
|
|
**/
|
|
g_object_class_install_property
|
|
(object_class, PROP_OPTIONS,
|
|
g_param_spec_boxed (NM_DHCP4_CONFIG_OPTIONS,
|
|
"Options",
|
|
"Options",
|
|
G_TYPE_HASH_TABLE,
|
|
G_PARAM_READABLE));
|
|
}
|
|
|
|
/**
|
|
* nm_dhcp4_config_new:
|
|
* @connection: the #DBusGConnection
|
|
* @object_path: the DBus object path of the device
|
|
*
|
|
* Creates a new #NMDHCP4Config.
|
|
*
|
|
* Returns: (transfer full): a new configuration
|
|
**/
|
|
GObject *
|
|
nm_dhcp4_config_new (DBusGConnection *connection, const char *object_path)
|
|
{
|
|
return (GObject *) g_object_new (NM_TYPE_DHCP4_CONFIG,
|
|
NM_OBJECT_DBUS_CONNECTION, connection,
|
|
NM_OBJECT_DBUS_PATH, object_path,
|
|
NULL);
|
|
}
|
|
|
|
/**
|
|
* nm_dhcp4_config_get_options:
|
|
* @config: a #NMDHCP4Config
|
|
*
|
|
* Gets all the options contained in the configuration.
|
|
*
|
|
* Returns: (transfer none) (element-type utf8 GObject.Value): the #GHashTable containing strings for keys and values.
|
|
* This is the internal copy used by the configuration, and must not be modified.
|
|
**/
|
|
GHashTable *
|
|
nm_dhcp4_config_get_options (NMDHCP4Config *config)
|
|
{
|
|
g_return_val_if_fail (NM_IS_DHCP4_CONFIG (config), NULL);
|
|
|
|
_nm_object_ensure_inited (NM_OBJECT (config));
|
|
return NM_DHCP4_CONFIG_GET_PRIVATE (config)->options;
|
|
}
|
|
|
|
/**
|
|
* nm_dhcp4_config_get_one_option:
|
|
* @config: a #NMDHCP4Config
|
|
* @option: the option to retrieve
|
|
*
|
|
* Gets one option by option name.
|
|
*
|
|
* Returns: the configuration option's value. This is the internal string used by the
|
|
* configuration, and must not be modified.
|
|
**/
|
|
const char *
|
|
nm_dhcp4_config_get_one_option (NMDHCP4Config *config, const char *option)
|
|
{
|
|
g_return_val_if_fail (NM_IS_DHCP4_CONFIG (config), NULL);
|
|
|
|
return g_hash_table_lookup (nm_dhcp4_config_get_options (config), option);
|
|
}
|
|
|