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=cd1fb0e546ff44217ff31846c03716554f5f5d7a;hp=89cb3e1efe816cad616c5f833a382348983f61ae;hb=8e959fbf3862172b53d200cda659795c3744fa78;hpb=9a17484d986f6cb8828afdf911db425b574c63fd diff --git a/src/libsystemd-bus/bus-message.h b/src/libsystemd-bus/bus-message.h index 89cb3e1ef..cd1fb0e54 100644 --- a/src/libsystemd-bus/bus-message.h +++ b/src/libsystemd-bus/bus-message.h @@ -23,21 +23,34 @@ #include #include +#include #include "macro.h" #include "sd-bus.h" +#include "kdbus.h" +#include "time-util.h" +#include "bus-creds.h" +#include "bus-protocol.h" struct bus_container { char enclosing; + bool need_offsets:1; + /* Indexes into the signature string */ + unsigned index, saved_index; char *signature; - unsigned index; + size_t before, begin, end; + + /* dbus1: pointer to the array size value, if this is a value */ uint32_t *array_size; - size_t begin; + + /* gvariant: list of offsets to end of children if this is struct/dict entry/array */ + size_t *offsets, n_offsets, offsets_allocated, offset_index; + size_t item_size; }; -_packed_ struct bus_header { +struct bus_header { uint8_t endian; uint8_t type; uint8_t flags; @@ -45,11 +58,26 @@ _packed_ struct bus_header { uint32_t body_size; uint32_t serial; uint32_t fields_size; +} _packed_; + +struct bus_body_part { + struct bus_body_part *next; + void *data; + size_t size; + size_t mapped; + size_t allocated; + int memfd; + bool free_this:1; + bool munmap_this:1; + bool sealed:1; + bool is_zero:1; }; struct sd_bus_message { unsigned n_ref; + sd_bus *bus; + uint32_t reply_serial; const char *path; @@ -57,46 +85,62 @@ struct sd_bus_message { const char *member; const char *destination; const char *sender; - const char *signature; sd_bus_error error; - uid_t uid; - gid_t gid; - pid_t pid; - pid_t tid; + sd_bus_creds creds; + + usec_t monotonic; + usec_t realtime; bool sealed: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 allow_fds:1; + bool free_header:1; + bool free_kdbus:1; + bool free_fds:1; + bool release_kdbus:1; + bool poisoned:1; struct bus_header *header; - void *fields; - void *body; + struct bus_body_part body; + struct bus_body_part *body_end; + unsigned n_body_parts; size_t rindex; + struct bus_body_part *cached_rindex_part; + size_t cached_rindex_part_begin; uint32_t n_fds; int *fds; struct bus_container root_container, *containers; unsigned n_containers; + size_t containers_allocated; - struct iovec iovec[4]; + struct iovec *iovec; + struct iovec iovec_fixed[2]; unsigned n_iovec; + struct kdbus_msg *kdbus; + 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]; + + size_t header_offsets[_BUS_MESSAGE_HEADER_MAX]; + unsigned n_header_offsets; }; -#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 != 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; @@ -122,13 +166,71 @@ static inline uint32_t BUS_MESSAGE_FIELDS_SIZE(sd_bus_message *m) { return BUS_MESSAGE_BSWAP32(m, m->header->fields_size); } -static inline void bus_message_unrefp(sd_bus_message **m) { - sd_bus_message_unref(*m); +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); } -#define _cleanup_bus_message_unref_ __attribute__((cleanup(bus_message_unrefp))) +static inline uint32_t BUS_MESSAGE_BODY_BEGIN(sd_bus_message *m) { + return + sizeof(struct bus_header) + + ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m)); +} + +static inline void* BUS_MESSAGE_FIELDS(sd_bus_message *m) { + return (uint8_t*) m->header + sizeof(struct bus_header); +} -int bus_message_parse(sd_bus_message *m); -int bus_message_seal(sd_bus_message *m, uint64_t serial); -int bus_message_dump(sd_bus_message *m); +static inline bool BUS_MESSAGE_IS_GVARIANT(sd_bus_message *m) { + return m->header->version == 2; +} + +int bus_message_seal(sd_bus_message *m, uint64_t serial, usec_t timeout); 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, + unsigned n_fds, + const struct ucred *ucred, + const char *label, + size_t extra, + sd_bus_message **ret); + +int bus_message_from_malloc( + sd_bus *bus, + 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); + +int bus_message_parse_fields(sd_bus_message *m); + +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); + +int bus_message_remarshal(sd_bus *bus, sd_bus_message **m);