bus: rename message "serial" to "cookie"

[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 d3db13b1deee8aeb451bc8256bf83ad62d210372..c73ceb4a068746a3b8e8f2e97bc589deae81f3b9 100644 (file)
--- a/src/libsystemd-bus/bus-internal.h
+++ b/src/libsystemd-bus/bus-internal.h
@@ -36,12 +36,13 @@
 #include "bus-error.h"
 #include "bus-match.h"
 #include "bus-kernel.h"
+#include "kdbus.h"
 
 struct reply_callback {
         sd_bus_message_handler_t callback;
         void *userdata;
         usec_t timeout;
-        uint64_t serial;
+        uint64_t cookie;
         unsigned prioq_idx;
 };
 
@@ -147,6 +148,7 @@ struct sd_bus {
         enum bus_state state;
         int input_fd, output_fd;
         int message_version;
+        int message_endian;
 
         bool is_kernel:1;
         bool can_fds:1;
@@ -159,7 +161,8 @@ struct sd_bus {
         bool match_callbacks_modified:1;
         bool filter_callbacks_modified:1;
         bool nodes_modified:1;
-        bool use_gvariant:1;
+        bool trusted:1;
+        bool fake_creds_valid:1;
 
         int use_memfd;
 
@@ -167,13 +170,15 @@ struct sd_bus {
         size_t rbuffer_size;
 
         sd_bus_message **rqueue;
-        unsigned rqueue_size, rqueue_allocated;
+        unsigned rqueue_size;
+        size_t rqueue_allocated;
 
         sd_bus_message **wqueue;
         unsigned wqueue_size;
         size_t windex;
+        size_t wqueue_allocated;
 
-        uint64_t serial;
+        uint64_t cookie;
 
         char *unique_name;
         uint64_t unique_id;
@@ -223,7 +228,7 @@ struct sd_bus {
         char *exec_path;
         char **exec_argv;
 
-        uint64_t hello_serial;
+        uint64_t hello_cookie;
         unsigned iteration_counter;
 
         void *kdbus_buffer;
@@ -250,11 +255,17 @@ struct sd_bus {
         sd_event_source *time_event_source;
         sd_event_source *quit_event_source;
         sd_event *event;
+        int event_priority;
 
         sd_bus_message *current;
 
         sd_bus **default_bus_ptr;
         pid_t tid;
+
+        struct kdbus_creds fake_creds;
+        char *fake_label;
+
+        char *cgroup_root;
 };
 
 #define BUS_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC))