The default message handler will now pass both the method_ctx and the

sbus_conn_ctx to all message handling functions.
This will allow connection-specific data to be passed in by taking advantage
of the sbus_conn_set_private_data() function on the sbus_conn_ctx struct.
Presently this private data is global to all methods of the connection context.

1 files changed, 11 insertions, 7 deletions

diff --git a/server/sbus/sssd_dbus.h b/server/sbus/sssd_dbus.h
index 5510b6e4a..321bd603e 100644
--- a/server/sbus/sssd_dbus.h
+++ b/server/sbus/sssd_dbus.h
@@ -52,19 +52,17 @@ struct sbus_method {
 
 struct sbus_method_ctx {
     struct sbus_method_ctx *prev, *next;
-    /*struct event_context *ev;*/
     char *interface;
     char *path;
-
-    /* If a non-default message_handler is desired, set it in this
-     * object before calling sbus_conn_add_method_ctx()
-     * Otherwise it will default to message_handler() in
-     * sssd_dbus_connection.c
-     */
     DBusObjectPathMessageFunction message_handler;
     struct sbus_method *methods;
 };
 
+struct sbus_message_handler_ctx {
+    struct sbus_conn_ctx *conn_ctx;
+    struct sbus_method_ctx *method_ctx;
+};
+
 /* Server Functions */
 int sbus_new_server(struct event_context *ev, struct sbus_method_ctx *ctx,
                     const char *address,
@@ -87,4 +85,10 @@ void sbus_conn_set_private_data(struct sbus_conn_ctx *conn_ctx, void *pvt_data);
 int sbus_conn_add_method_ctx(struct sbus_conn_ctx *conn_ctx,
                              struct sbus_method_ctx *method_ctx);
 
+/* Default message handler
+ * Should be usable for most cases */
+DBusHandlerResult sbus_message_handler(DBusConnection *conn,
+                                  DBusMessage *message,
+                                  void *user_data);
+
 #endif /* _SSSD_DBUS_H_*/