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=34dbc5d563430310fa39204b47d56de5b8cf1928;hp=aec6f75857b7593fe7ee7856e930c563758d93e9;hb=6717d473506800363af9d2bafbf263ee054e856d;hpb=2b5c5383e48137d748681645ad7176f02b50ba30 diff --git a/src/libsystemd-bus/bus-message.h b/src/libsystemd-bus/bus-message.h index aec6f7585..34dbc5d56 100644 --- a/src/libsystemd-bus/bus-message.h +++ b/src/libsystemd-bus/bus-message.h @@ -29,6 +29,7 @@ #include "sd-bus.h" #include "kdbus.h" #include "time-util.h" +#include "bus-creds.h" struct bus_container { char enclosing; @@ -78,19 +79,14 @@ struct sd_bus_message { sd_bus_error error; - uid_t uid; - gid_t gid; - pid_t pid; - pid_t tid; - usec_t pid_starttime; + sd_bus_creds creds; + usec_t monotonic; usec_t realtime; 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_kdbus:1; bool free_fds:1; @@ -102,8 +98,6 @@ struct sd_bus_message { struct bus_body_part *body_end; unsigned n_body_parts; - char *label; - size_t rindex; struct bus_body_part *cached_rindex_part; size_t cached_rindex_part_begin; @@ -122,28 +116,15 @@ 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]; - - const char *exe; - const char *comm; - const char *tid_comm; - const char *cgroup; - - const char *cmdline; - size_t cmdline_length; - char **cmdline_array; - - char *session; - char *unit; - char *user_unit; - - struct kdbus_audit *audit; - - uint8_t *capability; - size_t capability_size; }; #define BUS_MESSAGE_NEED_BSWAP(m) ((m)->header->endian != SD_BUS_NATIVE_ENDIAN) @@ -194,6 +175,7 @@ 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( + sd_bus *bus, void *header, size_t length, int *fds, @@ -204,6 +186,7 @@ int bus_message_from_header( sd_bus_message **ret); int bus_message_from_malloc( + sd_bus *bus, void *buffer, size_t length, int *fds,