colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: add cancelation to dispatcher calls

Browse Source
This commit is contained in:
Dan Williams
2012-06-05 11:29:04 -05:00
parent 15ca7cd56c
commit d42d41c1ac
2 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/nm-dispatcher.c
View File

@@ -30,6 +30,8 @@
#include "nm-dbus-manager.h" #include "nm-dbus-manager.h"
#include "nm-dbus-glib-types.h" #include "nm-dbus-glib-types.h"
static GSList *requests = NULL;
static void static void
dump_object_to_props (GObject *object, GHashTable *hash) dump_object_to_props (GObject *object, GHashTable *hash)
{ {
@@ -137,6 +139,7 @@ typedef struct {
static void static void
dispatcher_info_free (DispatchInfo *info) dispatcher_info_free (DispatchInfo *info)
{ {
requests = g_slist_remove (requests, info);
g_object_unref (info->dbus_mgr); g_object_unref (info->dbus_mgr);
g_free (info); g_free (info);
} }
@@ -206,7 +209,7 @@ dispatcher_done_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
} }
if (info->callback) if (info->callback)
info->callback (call, info->user_data); info->callback (info, info->user_data);
g_clear_error (&error); g_clear_error (&error);
g_object_unref (proxy); g_object_unref (proxy);
@@ -240,7 +243,7 @@ action_to_string (DispatcherAction action)
g_assert_not_reached (); g_assert_not_reached ();
} }
static gpointer static gconstpointer
_dispatcher_call (DispatcherAction action, _dispatcher_call (DispatcherAction action,
NMConnection *connection, NMConnection *connection,
NMDevice *device, NMDevice *device,
@@ -349,10 +352,13 @@ _dispatcher_call (DispatcherAction action,
g_hash_table_destroy (vpn_ip4_props); g_hash_table_destroy (vpn_ip4_props);
g_hash_table_destroy (vpn_ip6_props); g_hash_table_destroy (vpn_ip6_props);
return call; /* Track the request in case of cancelation */
requests = g_slist_append (requests, info);
return info;
} }
gpointer gconstpointer
nm_dispatcher_call (DispatcherAction action, nm_dispatcher_call (DispatcherAction action,
NMConnection *connection, NMConnection *connection,
NMDevice *device, NMDevice *device,
@@ -362,7 +368,7 @@ nm_dispatcher_call (DispatcherAction action,
return _dispatcher_call (action, connection, device, NULL, NULL, NULL, callback, user_data); return _dispatcher_call (action, connection, device, NULL, NULL, NULL, callback, user_data);
} }
gpointer gconstpointer
nm_dispatcher_call_vpn (DispatcherAction action, nm_dispatcher_call_vpn (DispatcherAction action,
NMConnection *connection, NMConnection *connection,
NMDevice *device, NMDevice *device,
@@ -375,3 +381,16 @@ nm_dispatcher_call_vpn (DispatcherAction action,
return _dispatcher_call (action, connection, device, vpn_iface, vpn_ip4_config, vpn_ip6_config, callback, user_data); return _dispatcher_call (action, connection, device, vpn_iface, vpn_ip4_config, vpn_ip6_config, callback, user_data);
} }
void
nm_dispatcher_call_cancel (gconstpointer call)
{
/* 'call' is really a DispatchInfo pointer, just opaque to callers.
* Look it up in our requests list, but don't access it directly before
* we've made sure it's a valid request,since it may have long since been
* freed. Canceling just means the callback doesn't get called, so set
* the DispatcherInfo's callback to NULL.
*/
if (g_slist_find (requests, call))
((DispatchInfo *) call)->callback = NULL;
}

8
src/nm-dispatcher.h
View File

@@ -42,15 +42,15 @@ typedef enum {
DISPATCHER_ACTION_DHCP6_CHANGE DISPATCHER_ACTION_DHCP6_CHANGE
} DispatcherAction; } DispatcherAction;
typedef void (*DispatcherFunc) (gpointer call, gpointer user_data); typedef void (*DispatcherFunc) (gconstpointer call, gpointer user_data);
gpointer nm_dispatcher_call (DispatcherAction action, gconstpointer nm_dispatcher_call (DispatcherAction action,
NMConnection *connection, NMConnection *connection,
NMDevice *device, NMDevice *device,
DispatcherFunc callback, DispatcherFunc callback,
gpointer user_data); gpointer user_data);
gpointer nm_dispatcher_call_vpn (DispatcherAction action, gconstpointer nm_dispatcher_call_vpn (DispatcherAction action,
NMConnection *connection, NMConnection *connection,
NMDevice *device, NMDevice *device,
const char *vpn_iface, const char *vpn_iface,
@@ -59,4 +59,6 @@ gpointer nm_dispatcher_call_vpn (DispatcherAction action,
DispatcherFunc callback, DispatcherFunc callback,
gpointer user_data); gpointer user_data);
void nm_dispatcher_call_cancel (gconstpointer call);
#endif /* NM_DISPATCHER_H */ #endif /* NM_DISPATCHER_H */