core: add dispatcher callbacks and simplify dispatcher function prototypes

Remove unused args for the non-VPN cases to cut down on the NULL NULL NULL
stuff since we're also adding two more arguments.  Add the ability for
callers to give a callback that should be called when the dispatcher is
done.

1 files changed, 28 insertions, 6 deletions

diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h
index b223cc5042..8514ba2c77 100644
--- a/src/nm-dispatcher.h
+++ b/src/nm-dispatcher.h
@@ -30,11 +30,33 @@
 #include "nm-ip6-config.h"
 #include "nm-connection.h"
 
-void nm_utils_call_dispatcher (const char *action,
-                               NMConnection *connection,
-                               NMDevice *device,
-                               const char *vpn_iface,
-                               NMIP4Config *vpn_ip4_config,
-                               NMIP6Config *vpn_ip6_config);
+typedef enum {
+	DISPATCHER_ACTION_HOSTNAME,
+	DISPATCHER_ACTION_UP,
+	DISPATCHER_ACTION_PRE_DOWN,
+	DISPATCHER_ACTION_DOWN,
+	DISPATCHER_ACTION_VPN_UP,
+	DISPATCHER_ACTION_VPN_PRE_DOWN,
+	DISPATCHER_ACTION_VPN_DOWN,
+	DISPATCHER_ACTION_DHCP4_CHANGE,
+	DISPATCHER_ACTION_DHCP6_CHANGE
+} DispatcherAction;
+
+typedef void (*DispatcherFunc) (gpointer call, gpointer user_data);
+
+gpointer nm_dispatcher_call (DispatcherAction action,
+                             NMConnection *connection,
+                             NMDevice *device,
+                             DispatcherFunc callback,
+                             gpointer user_data);
+
+gpointer nm_dispatcher_call_vpn (DispatcherAction action,
+                                 NMConnection *connection,
+                                 NMDevice *device,
+                                 const char *vpn_iface,
+                                 NMIP4Config *vpn_ip4_config,
+                                 NMIP6Config *vpn_ip6_config,
+                                 DispatcherFunc callback,
+                                 gpointer user_data);
 
 #endif /* NM_DISPATCHER_H */