nss-myhostname: do not use _cleanup_

[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 76b90ea3a68fba812aab156eda0f06dedb5198ec..feafed0876f63d5ea593ac463d738dd3524cde5d 100644 (file)
--- 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,14 +43,14 @@ struct reply_callback {
 };
 
 struct filter_callback {
-        sd_message_handler_t callback;
+        sd_bus_message_handler_t callback;
         void *userdata;
 
         LIST_FIELDS(struct filter_callback, callbacks);
 };
 
 struct object_callback {
-        sd_message_handler_t callback;
+        sd_bus_message_handler_t callback;
         void *userdata;
 
         char *path;
@@ -73,7 +74,7 @@ enum bus_auth {
 struct sd_bus {
         unsigned n_ref;
         enum bus_state state;
-        int fd;
+        int input_fd, output_fd;
         int message_version;
 
         bool negotiate_fds:1;
@@ -82,6 +83,8 @@ struct sd_bus {
         bool ucred_valid:1;
         bool is_server:1;
         bool anonymous_auth:1;
+        bool prefer_readv:1;
+        bool prefer_writev:1;
 
         void *rbuffer;
         size_t rbuffer_size;
@@ -97,6 +100,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);
@@ -110,7 +114,7 @@ struct sd_bus {
         } sockaddr;
         socklen_t sockaddr_size;
 
-        sd_id128_t peer;
+        sd_id128_t server_id;
 
         char *address;
         unsigned address_index;
@@ -166,6 +170,14 @@ 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);