bus: calculate iovec for messages only when we need it

[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 c62659e4248239ad85e2eb6a04881052df1ba352..126ced008378a07bc55dc66536ded9e9540cbcd3 100644 (file)
--- a/src/libsystemd-bus/bus-message.h
+++ b/src/libsystemd-bus/bus-message.h
@@ -23,6 +23,7 @@
 
 #include <stdbool.h>
 #include <byteswap.h>
+#include <sys/socket.h>
 
 #include "macro.h"
 #include "sd-bus.h"
@@ -34,9 +35,10 @@ struct bus_container {
         unsigned index;
 
         uint32_t *array_size;
+        size_t begin;
 };
 
-_packed_ struct bus_header {
+struct bus_header {
         uint8_t endian;
         uint8_t type;
         uint8_t flags;
@@ -44,7 +46,7 @@ _packed_ struct bus_header {
         uint32_t body_size;
         uint32_t serial;
         uint32_t fields_size;
-};
+} _packed_;
 
 struct sd_bus_message {
         unsigned n_ref;
@@ -56,7 +58,6 @@ struct sd_bus_message {
         const char *member;
         const char *destination;
         const char *sender;
-        const char *signature;
 
         sd_bus_error error;
 
@@ -66,46 +67,59 @@ struct sd_bus_message {
         pid_t tid;
 
         bool sealed:1;
+        bool dont_send:1;
+        bool allow_fds:1;
         bool uid_valid:1;
         bool gid_valid:1;
         bool free_header:1;
         bool free_fields:1;
         bool free_body:1;
+        bool free_fds:1;
 
         struct bus_header *header;
         void *fields;
         void *body;
 
+        char *label;
+
+        size_t rindex;
+
         uint32_t n_fds;
         int *fds;
 
-        struct bus_container root_container, *sub_containers;
+        struct bus_container root_container, *containers;
         unsigned n_containers;
 
         struct iovec iovec[4];
         unsigned n_iovec;
+
+        char *peeked_signature;
 };
 
-#if __BYTE_ORDER == __BIG_ENDIAN
-#define BUS_MESSAGE_NEED_BSWAP(m) ((m)->header->endian != SD_BUS_BIG_ENDIAN)
-#else
-#define BUS_MESSAGE_NEED_BSWAP(m) ((m)->header->endian != SD_BUS_LITTLE_ENDIAN)
-#endif
+#define BUS_MESSAGE_NEED_BSWAP(m) ((m)->header->endian != SD_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;
+}
 
-static inline uint32_t BUS_MESSAGE_BSWAP(sd_bus_message *m, uint32_t u) {
+static inline uint32_t BUS_MESSAGE_BSWAP32(sd_bus_message *m, uint32_t u) {
         return BUS_MESSAGE_NEED_BSWAP(m) ? bswap_32(u) : u;
 }
 
+static inline uint64_t BUS_MESSAGE_BSWAP64(sd_bus_message *m, uint64_t u) {
+        return BUS_MESSAGE_NEED_BSWAP(m) ? bswap_64(u) : u;
+}
+
 static inline uint32_t BUS_MESSAGE_SERIAL(sd_bus_message *m) {
-        return BUS_MESSAGE_BSWAP(m, m->header->serial);
+        return BUS_MESSAGE_BSWAP32(m, m->header->serial);
 }
 
 static inline uint32_t BUS_MESSAGE_BODY_SIZE(sd_bus_message *m) {
-        return BUS_MESSAGE_BSWAP(m, m->header->body_size);
+        return BUS_MESSAGE_BSWAP32(m, m->header->body_size);
 }
 
 static inline uint32_t BUS_MESSAGE_FIELDS_SIZE(sd_bus_message *m) {
-        return BUS_MESSAGE_BSWAP(m, m->header->fields_size);
+        return BUS_MESSAGE_BSWAP32(m, m->header->fields_size);
 }
 
 static inline void bus_message_unrefp(sd_bus_message **m) {
@@ -114,7 +128,22 @@ static inline void bus_message_unrefp(sd_bus_message **m) {
 
 #define _cleanup_bus_message_unref_ __attribute__((cleanup(bus_message_unrefp)))
 
-int message_parse(sd_bus_message *m);
-int message_seal(sd_bus_message *m, uint64_t serial);
-void message_dump(sd_bus_message *m);
+int bus_message_seal(sd_bus_message *m, uint64_t serial);
+int bus_message_dump(sd_bus_message *m);
 int bus_message_get_blob(sd_bus_message *m, void **buffer, size_t *sz);
+int bus_message_read_strv_extend(sd_bus_message *m, char ***l);
+
+int bus_message_from_malloc(
+                void *buffer,
+                size_t length,
+                int *fds,
+                unsigned n_fds,
+                const struct ucred *ucred,
+                const char *label,
+                sd_bus_message **ret);
+
+const char* bus_message_get_arg(sd_bus_message *m, unsigned i);
+
+int bus_message_append_ap(sd_bus_message *m, const char *types, va_list ap);
+
+size_t bus_message_size(sd_bus_message *m);