summaryrefslogtreecommitdiff
path: root/src/libsystemd/sd-bus/bus-message.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-02-13 17:32:38 +0100
committerLennart Poettering <lennart@poettering.net>2015-02-16 15:03:44 +0100
commit2ac7c17f9d8eeb403b91ee5a389562edaf47fb87 (patch)
tree3b55981e7648c1b58aaf6d656e28003c53c3497c /src/libsystemd/sd-bus/bus-message.h
parent38ab096869ad6bb39a9ef9a012abfb42ea62cd93 (diff)
Revert "Revert "sd-bus: change serialization of kdbus messages to qualify in their entirety as gvariant objects""
This reverts commit 954871d8ba15911d014f76ed2c7a9492953cf39d.
Diffstat (limited to 'src/libsystemd/sd-bus/bus-message.h')
-rw-r--r--src/libsystemd/sd-bus/bus-message.h47
1 files changed, 27 insertions, 20 deletions
diff --git a/src/libsystemd/sd-bus/bus-message.h b/src/libsystemd/sd-bus/bus-message.h
index b4cdce7bf4..32955329b4 100644
--- a/src/libsystemd/sd-bus/bus-message.h
+++ b/src/libsystemd/sd-bus/bus-message.h
@@ -99,7 +99,18 @@ struct sd_bus_message {
bool release_kdbus:1;
bool poisoned:1;
+ /* The first and last bytes of the message */
struct bus_header *header;
+ void *footer;
+
+ /* How many bytes are accessible in the above pointers */
+ size_t header_accessible;
+ size_t footer_accessible;
+
+ size_t fields_size;
+ size_t body_size;
+ size_t user_body_size;
+
struct bus_body_part body;
struct bus_body_part *body_end;
unsigned n_body_parts;
@@ -112,7 +123,7 @@ struct sd_bus_message {
int *fds;
struct bus_container root_container, *containers;
- unsigned n_containers;
+ size_t n_containers;
size_t containers_allocated;
struct iovec *iovec;
@@ -138,7 +149,9 @@ struct sd_bus_message {
unsigned n_header_offsets;
};
-#define BUS_MESSAGE_NEED_BSWAP(m) ((m)->header->endian != BUS_NATIVE_ENDIAN)
+static inline bool BUS_MESSAGE_NEED_BSWAP(sd_bus_message *m) {
+ return 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;
@@ -153,29 +166,23 @@ static inline uint64_t BUS_MESSAGE_BSWAP64(sd_bus_message *m, uint64_t u) {
}
static inline uint64_t BUS_MESSAGE_COOKIE(sd_bus_message *m) {
- /* Note that we return the serial converted to a 64bit value here */
- return BUS_MESSAGE_BSWAP32(m, m->header->serial);
-}
+ if (m->header->version == 2)
+ return BUS_MESSAGE_BSWAP64(m, m->header->dbus2.cookie);
-static inline uint32_t BUS_MESSAGE_BODY_SIZE(sd_bus_message *m) {
- return BUS_MESSAGE_BSWAP32(m, m->header->body_size);
+ return BUS_MESSAGE_BSWAP32(m, m->header->dbus1.serial);
}
-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) {
+static inline size_t BUS_MESSAGE_SIZE(sd_bus_message *m) {
return
sizeof(struct bus_header) +
- ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m)) +
- BUS_MESSAGE_BODY_SIZE(m);
+ ALIGN8(m->fields_size) +
+ m->body_size;
}
-static inline uint32_t BUS_MESSAGE_BODY_BEGIN(sd_bus_message *m) {
+static inline size_t BUS_MESSAGE_BODY_BEGIN(sd_bus_message *m) {
return
sizeof(struct bus_header) +
- ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m));
+ ALIGN8(m->fields_size);
}
static inline void* BUS_MESSAGE_FIELDS(sd_bus_message *m) {
@@ -193,7 +200,10 @@ 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,
+ size_t header_accessible,
+ void *footer,
+ size_t footer_accessible,
+ size_t message_size,
int *fds,
unsigned n_fds,
const struct ucred *ucred,
@@ -217,9 +227,6 @@ 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) \