X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-message.h;h=cc1e10d843c0e6c08df9899a664bfbd7a41fb1aa;hb=23e97f7d9274b90fb0e1664945dc6259fdae6d39;hp=0184d18dd9a0afca1195073c0e94adeafdb57411;hpb=89ffcd2ad5bf87866314e96c4179ba622851cd6e;p=elogind.git

diff --git a/src/libsystemd-bus/bus-message.h b/src/libsystemd-bus/bus-message.h
index 0184d18dd..cc1e10d84 100644
--- 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"
@@ -37,7 +38,7 @@ struct bus_container {
         size_t begin;
 };
 
-_packed_ struct bus_header {
+struct bus_header {
         uint8_t endian;
         uint8_t type;
         uint8_t flags;
@@ -45,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;
@@ -66,17 +67,21 @@ 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 dont_send:1;
+        bool free_fds:1;
 
         struct bus_header *header;
         void *fields;
         void *body;
 
+        char *label;
+
         size_t rindex;
 
         uint32_t n_fds;
@@ -87,6 +92,7 @@ struct sd_bus_message {
 
         struct iovec iovec[4];
         unsigned n_iovec;
+        size_t size;
 
         char *peeked_signature;
 };
@@ -126,5 +132,17 @@ static inline void bus_message_unrefp(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_from_malloc(void *buffer, size_t length, sd_bus_message **ret);
 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);