tests: skip bus test if bus cannot be opened

[elogind.git] / src / libsystemd-bus / sd-bus.h

diff --git a/src/libsystemd-bus/sd-bus.h b/src/libsystemd-bus/sd-bus.h
index 73710d15111fa4d2ec1b8862bbeb60b4c8fc304d..08c5e54230cb3cecdd2a3846373de3d89cc76627 100644 (file)
--- a/src/libsystemd-bus/sd-bus.h
+++ b/src/libsystemd-bus/sd-bus.h
@@ -25,18 +25,19 @@
 #include <inttypes.h>
 #include <sys/types.h>
 
+#include <sd-id128.h>
 #include "sd-bus-protocol.h"
 
 /* TODO:
+ * - server side
+ * - allow installing match callbacks
+ * - anonymous auth
+ * - default policy
  *
- * - make unix fd passing work
+ * Later:
  * - add page donation logic
  * - api for appending/reading fixed arrays
  * - merge busctl into systemctl or so?
- * - add object handlers
- * - implicitly add stub introspection calls
- * - implement unix exec protocol
- * - server side
  */
 
 typedef struct sd_bus sd_bus;
@@ -54,8 +55,15 @@ typedef int (*sd_message_handler_t)(sd_bus *bus, int ret, sd_bus_message *m, voi
 
 int sd_bus_open_system(sd_bus **ret);
 int sd_bus_open_user(sd_bus **ret);
-int sd_bus_open_address(const char *address, sd_bus **ret);
-int sd_bus_open_fd(int fd, sd_bus **ret);
+
+int sd_bus_new(sd_bus **ret);
+int sd_bus_set_address(sd_bus *bus, const char *address);
+int sd_bus_set_fd(sd_bus *bus, int fd);
+int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]);
+int sd_bus_set_bus_client(sd_bus *bus, int b);
+int sd_bus_set_negotiate_fds(sd_bus *bus, int b);
+int sd_bus_start(sd_bus *ret);
+
 void sd_bus_close(sd_bus *bus);
 
 sd_bus *sd_bus_ref(sd_bus *bus);
@@ -80,6 +88,12 @@ int sd_bus_flush(sd_bus *bus);
 int sd_bus_add_filter(sd_bus *bus, sd_message_handler_t callback, void *userdata);
 int sd_bus_remove_filter(sd_bus *bus, sd_message_handler_t callback, void *userdata);
 
+int sd_bus_add_object(sd_bus *bus, const char *path, sd_message_handler_t callback, void *userdata);
+int sd_bus_remove_object(sd_bus *bus, const char *path, sd_message_handler_t callback, void *userdata);
+
+int sd_bus_add_fallback(sd_bus *bus, const char *prefix, sd_message_handler_t callback, void *userdata);
+int sd_bus_remove_fallback(sd_bus *bus, const char *prefix, sd_message_handler_t callback, void *userdata);
+
 /* Message object */
 
 int sd_bus_message_new_signal(sd_bus *bus, const char *path, const char *interface, const char *member, sd_bus_message **m);