timedated: use libsystemd-bus instead of libdbus for bus communication

[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 1c50c7357a164083489c1c0dd28eb8c03a6832be..c79ff1bc932a2f60a518fa3dec59ccbe174a3428 100644 (file)
--- a/src/libsystemd-bus/bus-message.h
+++ b/src/libsystemd-bus/bus-message.h
@@ -33,9 +33,10 @@
 struct bus_container {
         char enclosing;
 
-        char *signature;
         unsigned index, saved_index;
 
+        char *signature;
+
         uint32_t *array_size;
         size_t before, begin;
 };
@@ -51,13 +52,15 @@ struct bus_header {
 } _packed_;
 
 struct bus_body_part {
+        struct bus_body_part *next;
         void *data;
         size_t size;
         size_t mapped;
         int memfd;
         bool free_this:1;
+        bool munmap_this:1;
         bool sealed:1;
-        struct bus_body_part *next;
+        bool is_zero:1;
 };
 
 struct sd_bus_message {
@@ -89,14 +92,12 @@ struct sd_bus_message {
         bool uid_valid:1;
         bool gid_valid:1;
         bool free_header:1;
-        bool free_fields:1;
         bool free_kdbus:1;
         bool free_fds:1;
         bool release_kdbus:1;
         bool poisoned:1;
 
         struct bus_header *header;
-        void *fields;
         struct bus_body_part body;
         struct bus_body_part *body_end;
         unsigned n_body_parts;
@@ -114,7 +115,7 @@ struct sd_bus_message {
         unsigned n_containers;
 
         struct iovec *iovec;
-        struct iovec iovec_fixed[3];
+        struct iovec iovec_fixed[2];
         unsigned n_iovec;
 
         struct kdbus_msg *kdbus;
@@ -178,11 +179,15 @@ static inline uint32_t BUS_MESSAGE_SIZE(sd_bus_message *m) {
                 BUS_MESSAGE_BODY_SIZE(m);
 }
 
-static inline void bus_message_unrefp(sd_bus_message **m) {
-        sd_bus_message_unref(*m);
+static inline uint32_t BUS_MESSAGE_BODY_BEGIN(sd_bus_message *m) {
+        return
+                sizeof(struct bus_header) +
+                ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m));
 }
 
-#define _cleanup_bus_message_unref_ __attribute__((cleanup(bus_message_unrefp)))
+static inline void* BUS_MESSAGE_FIELDS(sd_bus_message *m) {
+        return (uint8_t*) m->header + sizeof(struct bus_header);
+}
 
 int bus_message_seal(sd_bus_message *m, uint64_t serial);
 int bus_message_dump(sd_bus_message *m);
@@ -214,6 +219,17 @@ int bus_message_append_ap(sd_bus_message *m, const char *types, va_list ap);
 
 int bus_message_parse_fields(sd_bus_message *m);
 
-int bus_header_size(struct bus_header *h, size_t *sum);
+bool bus_header_is_complete(struct bus_header *h, size_t size);
+int bus_header_message_size(struct bus_header *h, size_t *sum);
 
 struct bus_body_part *message_append_part(sd_bus_message *m);
+
+#define MESSAGE_FOREACH_PART(part, i, m) \
+        for ((i) = 0, (part) = &(m)->body; (i) < (m)->n_body_parts; (i)++, (part) = (part)->next)
+
+int bus_body_part_map(struct bus_body_part *part);
+void bus_body_part_unmap(struct bus_body_part *part);
+
+int bus_message_to_errno(sd_bus_message *m);
+
+int bus_message_new_synthetic_error(sd_bus *bus, uint64_t serial, const sd_bus_error *e, sd_bus_message **m);