X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-internal.h;h=4babfac86dbe40bec7cf87571a759506b5182e60;hp=c25a208aea35ed59f5a76160d84329788ef6cd80;hb=a56f19c4f9c8ed5f916d7edbe1f73b7b49e68e83;hpb=94bbf1ba6d2c8f3c64879c7f1af114ca25edeb8f

diff --git a/src/libsystemd-bus/bus-internal.h b/src/libsystemd-bus/bus-internal.h
index c25a208ae..4babfac86 100644
--- a/src/libsystemd-bus/bus-internal.h
+++ b/src/libsystemd-bus/bus-internal.h
@@ -32,9 +32,10 @@
 
 #include "sd-bus.h"
 #include "bus-error.h"
+#include "bus-match.h"
 
 struct reply_callback {
-        sd_message_handler_t callback;
+        sd_bus_message_handler_t callback;
         void *userdata;
         usec_t timeout;
         uint64_t serial;
@@ -42,18 +43,22 @@ struct reply_callback {
 };
 
 struct filter_callback {
-        sd_message_handler_t callback;
+        sd_bus_message_handler_t callback;
         void *userdata;
 
+        unsigned last_iteration;
+
         LIST_FIELDS(struct filter_callback, callbacks);
 };
 
 struct object_callback {
-        sd_message_handler_t callback;
+        sd_bus_message_handler_t callback;
         void *userdata;
 
         char *path;
         bool is_fallback;
+
+        unsigned last_iteration;
 };
 
 enum bus_state {
@@ -64,16 +69,31 @@ enum bus_state {
         BUS_RUNNING
 };
 
+enum bus_auth {
+        _BUS_AUTH_INVALID,
+        BUS_AUTH_EXTERNAL,
+        BUS_AUTH_ANONYMOUS
+};
+
 struct sd_bus {
         unsigned n_ref;
         enum bus_state state;
-        int fd;
+        int input_fd, output_fd;
         int message_version;
 
+        bool is_kernel:1;
         bool negotiate_fds:1;
         bool can_fds:1;
         bool bus_client:1;
         bool ucred_valid:1;
+        bool is_server:1;
+        bool anonymous_auth:1;
+        bool prefer_readv:1;
+        bool prefer_writev:1;
+        bool processing:1;
+        bool match_callbacks_modified:1;
+        bool filter_callbacks_modified:1;
+        bool object_callbacks_modified:1;
 
         void *rbuffer;
         size_t rbuffer_size;
@@ -89,6 +109,7 @@ struct sd_bus {
 
         char *unique_name;
 
+        struct bus_match_node match_callbacks;
         Prioq *reply_callbacks_prioq;
         Hashmap *reply_callbacks;
         LIST_HEAD(struct filter_callback, filter_callbacks);
@@ -102,17 +123,20 @@ struct sd_bus {
         } sockaddr;
         socklen_t sockaddr_size;
 
-        sd_id128_t peer;
+        char *kernel;
+
+        sd_id128_t server_id;
 
         char *address;
         unsigned address_index;
 
         int last_connect_error;
 
+        enum bus_auth auth;
+        size_t auth_rbegin;
         struct iovec auth_iovec[3];
         unsigned auth_index;
-        size_t auth_size;
-        char *auth_uid;
+        char *auth_buffer;
         usec_t auth_timeout;
 
         struct ucred ucred;
@@ -123,6 +147,9 @@ struct sd_bus {
 
         char *exec_path;
         char **exec_argv;
+
+        uint64_t hello_serial;
+        unsigned iteration_counter;
 };
 
 static inline void bus_unrefp(sd_bus **b) {
@@ -155,6 +182,15 @@ bool interface_name_is_valid(const char *p);
 bool service_name_is_valid(const char *p);
 bool member_name_is_valid(const char *p);
 
+bool namespace_complex_pattern(const char *pattern, const char *value);
+bool path_complex_pattern(const char *pattern, const char *value);
+
+bool namespace_simple_pattern(const char *pattern, const char *value);
+bool path_simple_pattern(const char *pattern, const char *value);
+
+int bus_message_type_from_string(const char *s, uint8_t *u);
+const char *bus_message_type_to_string(uint8_t u);
+
 #define error_name_is_valid interface_name_is_valid
 
 int bus_ensure_running(sd_bus *bus);