X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-message.h;h=2cd1ef257d9f52cf75ce8bb37f6138d9c549313b;hp=cc1e10d843c0e6c08df9899a664bfbd7a41fb1aa;hb=4a875b6133c9ef0e984547f7ce3b09356be4f7bc;hpb=917b5dc7075a15bded4948efba8e686dba4509f8

diff --git a/src/libsystemd-bus/bus-message.h b/src/libsystemd-bus/bus-message.h
index cc1e10d84..2cd1ef257 100644
--- a/src/libsystemd-bus/bus-message.h
+++ b/src/libsystemd-bus/bus-message.h
@@ -27,6 +27,8 @@
 
 #include "macro.h"
 #include "sd-bus.h"
+#include "kdbus.h"
+#include "time-util.h"
 
 struct bus_container {
         char enclosing;
@@ -65,6 +67,9 @@ struct sd_bus_message {
         gid_t gid;
         pid_t pid;
         pid_t tid;
+        usec_t pid_starttime;
+        usec_t monotonic;
+        usec_t realtime;
 
         bool sealed:1;
         bool dont_send:1;
@@ -74,11 +79,13 @@ struct sd_bus_message {
         bool free_header:1;
         bool free_fields:1;
         bool free_body:1;
+        bool free_kdbus:1;
         bool free_fds:1;
 
         struct bus_header *header;
         void *fields;
         void *body;
+        struct kdbus_msg *kdbus;
 
         char *label;
 
@@ -90,11 +97,24 @@ struct sd_bus_message {
         struct bus_container root_container, *containers;
         unsigned n_containers;
 
-        struct iovec iovec[4];
+        struct iovec iovec[3];
         unsigned n_iovec;
-        size_t size;
 
         char *peeked_signature;
+
+        usec_t timeout;
+
+        char sender_buffer[3 + DECIMAL_STR_MAX(uint64_t) + 1];
+        char destination_buffer[3 + DECIMAL_STR_MAX(uint64_t) + 1];
+
+        const char *exe;
+        const char *comm;
+        const char *tid_comm;
+        const char *cgroup;
+
+        const char *cmdline;
+        size_t cmdline_length;
+        char **cmdline_array;
 };
 
 #define BUS_MESSAGE_NEED_BSWAP(m) ((m)->header->endian != SD_BUS_NATIVE_ENDIAN)
@@ -123,6 +143,13 @@ static inline uint32_t BUS_MESSAGE_FIELDS_SIZE(sd_bus_message *m) {
         return BUS_MESSAGE_BSWAP32(m, m->header->fields_size);
 }
 
+static inline uint32_t BUS_MESSAGE_SIZE(sd_bus_message *m) {
+        return
+                sizeof(struct bus_header) +
+                ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m)) +
+                BUS_MESSAGE_BODY_SIZE(m);
+}
+
 static inline void bus_message_unrefp(sd_bus_message **m) {
         sd_bus_message_unref(*m);
 }
@@ -134,6 +161,16 @@ 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_header(
+                void *header,
+                size_t length,
+                int *fds,
+                unsigned n_fds,
+                const struct ucred *ucred,
+                const char *label,
+                size_t extra,
+                sd_bus_message **ret);
+
 int bus_message_from_malloc(
                 void *buffer,
                 size_t length,
@@ -146,3 +183,7 @@ int bus_message_from_malloc(
 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);
+
+int bus_message_parse_fields(sd_bus_message *m);
+
+int bus_header_size(struct bus_header *h, size_t *sum);