fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 17:40:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm-glib: get devices and their properties in constructor (NMClient, NMDevice)

Browse source 
NMClient and NMDevice used a 'lazy' approach for getting stuff from D-Bus, i.e.
requesting data from NM when they are asked for. However, for some cases, like
removing devices it is not optimal. libnm-glib will never see a device that was
removed, but not added during NMClient's lifetime.

So let's get devices list in NMClient's constructor and device properties
in NMDevice constructor to have the data from the beginning.
This commit is contained in:
Jiří Klimeš 2011-11-24 16:42:37 +01:00
parent 43b3466b14
commit 42060fdd89
2 changed files with 69 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libnm-glib/nm-client.c
View file

@ -1424,6 +1424,14 @@ constructor (GType type,
g_signal_connect (object, "notify::" NM_CLIENT_ACTIVE_CONNECTIONS,
G_CALLBACK (active_connections_changed_cb), NULL);
/* Get initial devices from NM. It is important to do it early. Else,
* a 'lazy' call won't find removed device.
* Solves this case: DeviceRemoved signal is received, we get devices
* from NM, but the removed object path is not there any more, and
* NMClient doesn't have the device either.
*/
nm_client_get_devices (NM_CLIENT (object));
return G_OBJECT (object);
}

61
libnm-glib/nm-device.c
View file

@ -36,6 +36,7 @@
#include "nm-object-private.h"
#include "nm-object-cache.h"
#include "nm-marshal.h"
#include "nm-dbus-glib-types.h"
#include "nm-device-bindings.h"
@ -334,6 +335,60 @@ device_state_changed (DBusGProxy *proxy,
}
}
static void
get_all_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
{
NMObject *self = NM_OBJECT (user_data);
GHashTable *props = NULL;
GError *error = NULL;
if (!dbus_g_proxy_end_call (proxy, call, &error,
DBUS_TYPE_G_MAP_OF_VARIANT, &props,
G_TYPE_INVALID)) {
if (!(error->domain == DBUS_GERROR && error->code == DBUS_GERROR_NO_REPLY)) {
g_warning ("%s: couldn't retrieve device properties: (%d) %s.",
__func__,
error ? error->code : -1,
(error && error->message) ? error->message : "(unknown)");
}
g_clear_error (&error);
g_object_unref (proxy);
return;
}
g_object_unref (proxy);
/* Hack: libnm-glib's NMDevice doesn't have ip4-address property. Remove
* it from the hash to prevent warnings.
*/
g_hash_table_remove (props, "Ip4Address");
_nm_object_process_properties_changed (NM_OBJECT (self), props);
g_hash_table_destroy (props);
}
static void
initialize_properties (NMObject *object)
{
DBusGProxy *props_proxy;
/* D-Bus properties proxy */
props_proxy = dbus_g_proxy_new_for_name (nm_object_get_connection (object),
NM_DBUS_SERVICE,
nm_object_get_path (object),
"org.freedesktop.DBus.Properties");
g_assert (props_proxy);
/* Get properties */
dbus_g_proxy_begin_call (props_proxy, "GetAll",
get_all_cb,
object,
NULL,
G_TYPE_STRING, NM_DBUS_INTERFACE_DEVICE,
G_TYPE_INVALID);
}
static GObject*
constructor (GType type,
guint n_construct_params,
@ -357,6 +412,12 @@ constructor (GType type,
register_for_property_changed (NM_DEVICE (object));
/* Get initial properties, so that we have all properties set even if
* no PropertiesChanged signal is received.
* It has to be called after register_for_property_changed().
*/
initialize_properties (object);
dbus_g_object_register_marshaller (_nm_marshal_VOID__UINT_UINT_UINT,
G_TYPE_NONE,
G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT,