mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-03 05:28:01 +02:00
a88e1dd3a2
Make NMDevice abstract class, remove almost all references to it's subclasses (the last place gets removed with new policy manager). Add NMDeviceInterface (which NMDevice implements) so that when we have NMDevice exported over DBUS, there's a common NMDevice interface which all instances have, plus there's a device specific interface for each specific type. Remove functions (nm_device_is_802_3_ethernet) and (nm_device_is_802_11_wireless). There are already standard GObject macros for type safe checks. Use the updated supplican manager API. * src/nm-device-interface.h: * src/nm-device-interface.c: * src/nm-call-store.h: * src/nm-call-store.c: Implement. * src/supplicant-manager/nm-supplicant-interface.c: * src/supplicant-manager/nm-supplicant-interface.h: * src/supplicant-manager/nm-supplicant-manager.c: * src/supplicant-manager/nm-supplicant-manager.h: - Remove all private data type references from public header files. - Remove all references to other NM classes, this class is just a proxy between wpa_supplicant and NM so it doesn't have to know any internals. - Convert to dbus-glib bindings. - Type safe checks for public methods' arguments. - Store pending DBUS call ids to NMCallStore. * src/supplicant-manager/nm-supplicant-config.c: - Store config values in a GHashTable instead of GSList. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2285 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
147 lines
3.2 KiB
C
147 lines
3.2 KiB
C
#include "nm-call-store.h"
|
|
#include "nm-utils.h"
|
|
|
|
NMCallStore *
|
|
nm_call_store_new (void)
|
|
{
|
|
return g_hash_table_new_full (NULL, NULL, NULL,
|
|
(GDestroyNotify) g_hash_table_destroy);
|
|
}
|
|
|
|
static void
|
|
object_destroyed_cb (gpointer data, GObject *object)
|
|
{
|
|
g_hash_table_remove ((NMCallStore *) data, object);
|
|
}
|
|
|
|
void
|
|
nm_call_store_add (NMCallStore *store,
|
|
GObject *object,
|
|
gpointer *call_id)
|
|
{
|
|
GHashTable *call_ids_hash;
|
|
|
|
g_return_if_fail (store != NULL);
|
|
g_return_if_fail (object != NULL);
|
|
g_return_if_fail (call_id != NULL);
|
|
|
|
call_ids_hash = g_hash_table_lookup (store, object);
|
|
if (!call_ids_hash) {
|
|
call_ids_hash = g_hash_table_new (NULL, NULL);
|
|
g_hash_table_insert (store, object, call_ids_hash);
|
|
g_object_weak_ref (object, object_destroyed_cb, store);
|
|
}
|
|
|
|
g_hash_table_insert (call_ids_hash, call_id, NULL);
|
|
}
|
|
|
|
void
|
|
nm_call_store_remove (NMCallStore *store,
|
|
GObject *object,
|
|
gpointer call_id)
|
|
{
|
|
GHashTable *call_ids_hash;
|
|
|
|
g_return_if_fail (store != NULL);
|
|
g_return_if_fail (object != NULL);
|
|
g_return_if_fail (call_id != NULL);
|
|
|
|
call_ids_hash = g_hash_table_lookup (store, object);
|
|
if (!call_ids_hash) {
|
|
nm_warning ("Trying to move a non-existant call id.");
|
|
return;
|
|
}
|
|
|
|
if (!g_hash_table_remove (call_ids_hash, call_id))
|
|
nm_warning ("Trying to move a non-existant call id.");
|
|
|
|
if (g_hash_table_size (call_ids_hash) == 0) {
|
|
g_hash_table_remove (store, object);
|
|
g_object_weak_unref (object, object_destroyed_cb, store);
|
|
}
|
|
}
|
|
|
|
typedef struct {
|
|
GObject *object;
|
|
gint count;
|
|
NMCallStoreFunc callback;
|
|
gpointer user_data;
|
|
} StoreForeachInfo;
|
|
|
|
static void
|
|
call_callback (gpointer key, gpointer value, gpointer user_data)
|
|
{
|
|
StoreForeachInfo *info = (StoreForeachInfo *) user_data;
|
|
|
|
if (info->count >= 0) {
|
|
if (info->callback (info->object, key, info->user_data))
|
|
info->count++;
|
|
else
|
|
info->count = -1;
|
|
}
|
|
}
|
|
|
|
static void
|
|
call_all_callbacks (gpointer key, gpointer value, gpointer user_data)
|
|
{
|
|
StoreForeachInfo *info = (StoreForeachInfo *) user_data;
|
|
|
|
info->object = G_OBJECT (key);
|
|
g_hash_table_foreach ((GHashTable *) value, call_callback, info);
|
|
}
|
|
|
|
int
|
|
nm_call_store_foreach (NMCallStore *store,
|
|
GObject *object,
|
|
NMCallStoreFunc callback,
|
|
gpointer user_data)
|
|
{
|
|
StoreForeachInfo info;
|
|
|
|
g_return_val_if_fail (store != NULL, -1);
|
|
g_return_val_if_fail (callback != NULL, -1);
|
|
|
|
info.object = object;
|
|
info.count = 0;
|
|
info.callback = callback;
|
|
info.user_data = user_data;
|
|
|
|
if (object) {
|
|
GHashTable *call_ids_hash;
|
|
|
|
call_ids_hash = g_hash_table_lookup (store, object);
|
|
if (!call_ids_hash) {
|
|
nm_warning ("Object not in store");
|
|
return -1;
|
|
}
|
|
|
|
g_hash_table_foreach (call_ids_hash, call_callback, &info);
|
|
} else {
|
|
g_hash_table_foreach (store, call_all_callbacks, &info);
|
|
}
|
|
|
|
return info.count;
|
|
}
|
|
|
|
static void
|
|
remove_weakref (gpointer key, gpointer value, gpointer user_data)
|
|
{
|
|
g_object_weak_unref (G_OBJECT (key), object_destroyed_cb, user_data);
|
|
}
|
|
|
|
void
|
|
nm_call_store_clear (NMCallStore *store)
|
|
{
|
|
g_return_if_fail (store);
|
|
|
|
g_hash_table_foreach (store, remove_weakref, store);
|
|
g_hash_table_remove_all (store);
|
|
}
|
|
|
|
void
|
|
nm_call_store_destroy (NMCallStore *store)
|
|
{
|
|
g_return_if_fail (store);
|
|
|
|
g_hash_table_destroy (store);
|
|
}
|