bus: parse matches locally and allow registration of callbacks for them

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

diff --git a/src/libsystemd-bus/bus-internal.h b/src/libsystemd-bus/bus-internal.h
index d0b7b5658dbc479f4336dd80eb9e21560c31a905..1dcb38303858a890012eff122adc7695bffef545 100644 (file)
--- a/src/libsystemd-bus/bus-internal.h
+++ b/src/libsystemd-bus/bus-internal.h
@@ -32,6 +32,7 @@
 
 #include "sd-bus.h"
 #include "bus-error.h"
+#include "bus-match.h"
 
 struct reply_callback {
         sd_message_handler_t callback;
@@ -48,20 +49,40 @@ struct filter_callback {
         LIST_FIELDS(struct filter_callback, callbacks);
 };
 
+struct object_callback {
+        sd_message_handler_t callback;
+        void *userdata;
+
+        char *path;
+        bool is_fallback;
+};
+
 enum bus_state {
+        BUS_UNSET,
         BUS_OPENING,
         BUS_AUTHENTICATING,
         BUS_HELLO,
         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 message_version;
+
+        bool negotiate_fds:1;
         bool can_fds:1;
-        bool sent_hello:1;
+        bool bus_client:1;
+        bool ucred_valid:1;
+        bool is_server:1;
+        bool anonymous_auth:1;
 
         void *rbuffer;
         size_t rbuffer_size;
@@ -77,9 +98,11 @@ 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);
+        Hashmap *object_callbacks;
 
         union {
                 struct sockaddr sa;
@@ -96,11 +119,23 @@ struct sd_bus {
 
         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;
+        char label[NAME_MAX];
+
+        int *fds;
+        unsigned n_fds;
+
+        char *exec_path;
+        char **exec_argv;
+
+        uint64_t hello_serial;
 };
 
 static inline void bus_unrefp(sd_bus **b) {
@@ -124,9 +159,25 @@ static inline void bus_unrefp(sd_bus **b) {
  * bytes */
 #define BUS_ARRAY_MAX_SIZE 67108864
 
+#define BUS_FDS_MAX 1024
+
+#define BUS_EXEC_ARGV_MAX 256
+
 bool object_path_is_valid(const char *p);
 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);
+
 #define error_name_is_valid interface_name_is_valid
+
+int bus_ensure_running(sd_bus *bus);
+int bus_start_running(sd_bus *bus);
+int bus_next_address(sd_bus *bus);