mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-07 16:00:21 +01:00
* libnm-glib/nm-device-802-11-wireless.c: Cache networks (bssids) list. We get signalled when it changes. * libnm-glib/nm-client.c: Cache NMState and device list, we get signalled when it changes. * libnm-glib/nm-device.c: Cache the device state property. * libnm-glib/nm-access-point.c: Cache the strength property. * src/nm-device-802-11-wireless.c: Fix wireless device scanning scheduler. The new algorithm is to start from SCAN_INTERVAL_MIN (currently defined as 0) and add a SCAN_INTERVAL_STEP (currently 20 seconds) with each successful scan until SCAN_INTERVAL_MAX (currently 120 seconds) is reached. Do not scan while the device is down, activating, or activated (in case of A/B/G cards). Remove some old dead ifdef'ed out code that used to configure wireless devices, it's all done through supplicant now. * src/supplicant-manager/nm-supplicant-interface.c: Fix the reference counting issues with pending calls which caused leaks and crashes when interface was removed (now that the interface actually gets removed). * src/nm-call-store.c: Make a copy of data before running a foreach with user callback on it - The most common usage pattern is to cancel (and thus remove) all pending calls with foreach which would modify the hash table we're iterating over. * src/nm-manager.c: When a device is added, make sure it is "up". When it's removed or disabled due to disabling wireless or networking, bring it down. * include/NetworkManager.h: Add new device state NM_DEVICE_STATE_DOWN. * src/nm-device-802-11-wireless.c: * src/nm-device-802-3-ethernet.c: * src/nm-device.c: - Remove "init" virtual function, all gobjects have a place for that already (constructor). - Replace "start" virtual function with "bring_up", devices can be brought up and down more than just on startup now. - Add "is_up" virtual function. - Implement one way to bring a device down instead of previous 4 different ways, each of witch did something different. * src/NetworkManagerUtils.c (nm_dev_sock_open): This doesn't need an NMDevice, all it needs is the device interface. Get rid of NMData.dev_list (3 members to go). Get rif of NMData in a lot of places. * gnome/libnm_glib/libnm_glib.c: Make it compile again. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2395 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
188 lines
4.1 KiB
C
188 lines
4.1 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 call_id, gpointer user_data)
|
|
{
|
|
StoreForeachInfo *info = (StoreForeachInfo *) user_data;
|
|
|
|
if (info->count >= 0) {
|
|
if (info->callback (info->object, call_id, info->user_data))
|
|
info->count++;
|
|
else
|
|
info->count = -1;
|
|
}
|
|
}
|
|
|
|
static void
|
|
prepend_id (gpointer key, gpointer value, gpointer user_data)
|
|
{
|
|
GSList **list = (GSList **) user_data;
|
|
|
|
*list = g_slist_prepend (*list, key);
|
|
}
|
|
|
|
static GSList *
|
|
get_call_ids (GHashTable *hash)
|
|
{
|
|
GSList *ids = NULL;
|
|
|
|
g_hash_table_foreach (hash, prepend_id, &ids);
|
|
|
|
return ids;
|
|
}
|
|
|
|
static void
|
|
call_all_callbacks (gpointer key, gpointer value, gpointer user_data)
|
|
{
|
|
StoreForeachInfo *info = (StoreForeachInfo *) user_data;
|
|
GSList *ids;
|
|
|
|
info->object = G_OBJECT (key);
|
|
|
|
/* Create a copy of the hash keys (call_ids) so that the callback is
|
|
free to modify the store */
|
|
ids = get_call_ids ((GHashTable *) value);
|
|
g_slist_foreach (ids, call_callback, info);
|
|
g_slist_free (ids);
|
|
}
|
|
|
|
static void
|
|
duplicate_hash (gpointer key, gpointer value, gpointer user_data)
|
|
{
|
|
g_hash_table_insert ((GHashTable *) user_data, key, value);
|
|
}
|
|
|
|
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;
|
|
GSList *ids;
|
|
|
|
call_ids_hash = g_hash_table_lookup (store, object);
|
|
if (!call_ids_hash) {
|
|
nm_warning ("Object not in store");
|
|
return -1;
|
|
}
|
|
|
|
/* Create a copy of the hash keys (call_ids) so that the callback is
|
|
free to modify the store */
|
|
ids = get_call_ids (call_ids_hash);
|
|
g_slist_foreach (ids, call_callback, &info);
|
|
g_slist_free (ids);
|
|
} else {
|
|
GHashTable *copy;
|
|
|
|
/* Create a copy of the main store so that callbacks can modify it */
|
|
copy = g_hash_table_new (NULL, NULL);
|
|
g_hash_table_foreach (store, duplicate_hash, copy);
|
|
g_hash_table_foreach (copy, call_all_callbacks, &info);
|
|
g_hash_table_destroy (copy);
|
|
}
|
|
|
|
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);
|
|
}
|