bus: catch up with latest kdbus changes

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

diff --git a/src/libsystemd-bus/bus-message.h b/src/libsystemd-bus/bus-message.h
index 72a79f792b4276b568e316187f5f750cf4151785..b862cb9443b60cde358d2b7d91faab032ee22585 100644 (file)
--- a/src/libsystemd-bus/bus-message.h
+++ b/src/libsystemd-bus/bus-message.h
@@ -30,6 +30,7 @@
 #include "kdbus.h"
 #include "time-util.h"
 #include "bus-creds.h"
+#include "bus-protocol.h"
 
 struct bus_container {
         char enclosing;
@@ -40,6 +41,11 @@ struct bus_container {
 
         uint32_t *array_size;
         size_t before, begin;
+
+        size_t *offsets;
+        size_t n_offsets, n_allocated;
+
+        bool need_offsets;
 };
 
 struct bus_header {
@@ -92,6 +98,7 @@ struct sd_bus_message {
         bool free_fds:1;
         bool release_kdbus:1;
         bool poisoned:1;
+        bool is_gvariant:1;
 
         struct bus_header *header;
         struct bus_body_part body;
@@ -116,13 +123,21 @@ struct sd_bus_message {
 
         char *peeked_signature;
 
+        /* If set replies to this message must carry the signature
+         * specified here to successfully seal. This is initialized
+         * from the vtable data */
+        const char *enforced_reply_signature;
+
         usec_t timeout;
 
         char sender_buffer[3 + DECIMAL_STR_MAX(uint64_t) + 1];
         char destination_buffer[3 + DECIMAL_STR_MAX(uint64_t) + 1];
+
+        size_t header_offsets[_BUS_MESSAGE_HEADER_MAX];
+        unsigned n_header_offsets;
 };
 
-#define BUS_MESSAGE_NEED_BSWAP(m) ((m)->header->endian != SD_BUS_NATIVE_ENDIAN)
+#define BUS_MESSAGE_NEED_BSWAP(m) ((m)->header->endian != BUS_NATIVE_ENDIAN)
 
 static inline uint16_t BUS_MESSAGE_BSWAP16(sd_bus_message *m, uint16_t u) {
         return BUS_MESSAGE_NEED_BSWAP(m) ? bswap_16(u) : u;