X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fsd-bus.h;h=a759f54f3e1f82f94b71bf72eedda974d10eabcb;hp=6d53d5afd8a52136fa328cb9394a104f3c35cf90;hb=29f6aadd5302320d5a7a3868b607eb83687bdfd0;hpb=de1c301ed165eb4d04a0c9d4babe97912b5233bb

diff --git a/src/libsystemd-bus/sd-bus.h b/src/libsystemd-bus/sd-bus.h
index 6d53d5afd..a759f54f3 100644
--- a/src/libsystemd-bus/sd-bus.h
+++ b/src/libsystemd-bus/sd-bus.h
@@ -27,6 +27,21 @@
 
 #include "sd-bus-protocol.h"
 
+/* TODO:
+ *
+ * - make unix fd passing work
+ * - add page donation logic
+ * - api for appending/reading fixed arrays
+ * - always verify container depth
+ * - handle NULL strings nicer when appending
+ * - merge busctl into systemctl or so?
+ * - add object handlers
+ * - add peer message handlers
+ * - verify object paths
+ * - when reading a message, verify its size
+ * - add limits to wqueue and rqueue alike
+ */
+
 typedef struct sd_bus sd_bus;
 typedef struct sd_bus_message sd_bus_message;
 
@@ -36,7 +51,7 @@ typedef struct {
         int need_free;
 } sd_bus_error;
 
-typedef int (*sd_message_handler_t)(sd_bus *bus, sd_bus_message *m, void *userdata);
+typedef int (*sd_message_handler_t)(sd_bus *bus, int ret, sd_bus_message *m, void *userdata);
 
 /* Connections */
 
@@ -49,6 +64,7 @@ void sd_bus_close(sd_bus *bus);
 sd_bus *sd_bus_ref(sd_bus *bus);
 sd_bus *sd_bus_unref(sd_bus *bus);
 
+int sd_bus_is_open(sd_bus *bus);
 int sd_bus_is_running(sd_bus *bus);
 int sd_bus_can_send(sd_bus *bus, char type);
 
@@ -59,6 +75,7 @@ int sd_bus_send_with_reply_and_block(sd_bus *bus, sd_bus_message *m, uint64_t us
 
 int sd_bus_get_fd(sd_bus *bus);
 int sd_bus_get_events(sd_bus *bus);
+int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec);
 int sd_bus_process(sd_bus *bus, sd_bus_message **r);
 int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec);
 int sd_bus_flush(sd_bus *bus);
@@ -105,9 +122,12 @@ int sd_bus_message_append_basic(sd_bus_message *m, char type, const void *p);
 int sd_bus_message_open_container(sd_bus_message *m, char type, const char *contents);
 int sd_bus_message_close_container(sd_bus_message *m);
 
-int sd_bus_message_read_type(sd_bus_message *m, char *type, char *element, size_t *length);
-int sd_bus_message_read_basic(sd_bus_message *m, char type, char element, const void **p, size_t *length);
 int sd_bus_message_read(sd_bus_message *m, const char *types, ...);
+int sd_bus_message_read_basic(sd_bus_message *m, char type, void *p);
+int sd_bus_message_enter_container(sd_bus_message *m, char type, const char *contents);
+int sd_bus_message_exit_container(sd_bus_message *m);
+int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char **contents);
+int sd_bus_message_rewind(sd_bus_message *m, int complete);
 
 /* Bus management */
 
@@ -121,9 +141,10 @@ int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid);
 int sd_bus_add_match(sd_bus *bus, const char *match);
 int sd_bus_remove_match(sd_bus *bus, const char *match);
 
-/* Error objects */
+/* Error structures */
 
-#define SD_BUS_ERROR_INIT (NULL, NULL, false)
+#define SD_BUS_ERROR_INIT {NULL, NULL, 0}
+#define SD_BUS_ERROR_INIT_CONST(name, message) {(name), (message), 0}
 
 void sd_bus_error_free(sd_bus_error *e);
 int sd_bus_error_set(sd_bus_error *e, const char *name, const char *format, ...);