dispatcher: add synchronous dispatcher calls

On shutdown we can't defer the response to a callback, so we need to
use synchronous D-Bus calls.  Second, sometimes we want to block on
the dispatcher response, like for pre-down.

1 files changed, 24 insertions, 11 deletions

diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h
index 179eb2f31e..cf3e62613f 100644
--- a/src/nm-dispatcher.h
+++ b/src/nm-dispatcher.h
@@ -42,24 +42,37 @@ typedef enum {
 	DISPATCHER_ACTION_DHCP6_CHANGE
 } DispatcherAction;
 
-typedef void (*DispatcherFunc) (gconstpointer call, gpointer user_data);
+typedef void (*DispatcherFunc) (gconstpointer call_id, gpointer user_data);
 
-gconstpointer nm_dispatcher_call (DispatcherAction action,
+gboolean nm_dispatcher_call (DispatcherAction action,
+                             NMConnection *connection,
+                             NMDevice *device,
+                             DispatcherFunc callback,
+                             gpointer user_data,
+                             gconstpointer *out_call_id);
+
+gboolean nm_dispatcher_call_sync (DispatcherAction action,
                                   NMConnection *connection,
-                                  NMDevice *device,
-                                  DispatcherFunc callback,
-                                  gpointer user_data);
+                                  NMDevice *device);
+
+gboolean nm_dispatcher_call_vpn (DispatcherAction action,
+                                 NMConnection *connection,
+                                 NMDevice *parent_device,
+                                 const char *vpn_iface,
+                                 NMIP4Config *vpn_ip4_config,
+                                 NMIP6Config *vpn_ip6_config,
+                                 DispatcherFunc callback,
+                                 gpointer user_data,
+                                 gconstpointer *out_call_id);
 
-gconstpointer nm_dispatcher_call_vpn (DispatcherAction action,
+gboolean nm_dispatcher_call_vpn_sync (DispatcherAction action,
                                       NMConnection *connection,
-                                      NMDevice *device,
+                                      NMDevice *parent_device,
                                       const char *vpn_iface,
                                       NMIP4Config *vpn_ip4_config,
-                                      NMIP6Config *vpn_ip6_config,
-                                      DispatcherFunc callback,
-                                      gpointer user_data);
+                                      NMIP6Config *vpn_ip6_config);
 
-void nm_dispatcher_call_cancel (gconstpointer call);
+void nm_dispatcher_call_cancel (gconstpointer call_id);
 
 void nm_dispatcher_init (void);