chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus, shared: fix includes
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-message.h
diff --git
a/src/libsystemd/sd-bus/bus-message.h
b/src/libsystemd/sd-bus/bus-message.h
index db5f90c5de226341e7d5b7ecab1d48099e8f643c..d784e603dd7bdeddbb897ba311a854e2ebe2d3c6 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-message.h
+++ b/
src/libsystemd/sd-bus/bus-message.h
@@
-27,7
+27,6
@@
#include "macro.h"
#include "sd-bus.h"
#include "macro.h"
#include "sd-bus.h"
-#include "kdbus.h"
#include "time-util.h"
#include "bus-creds.h"
#include "bus-protocol.h"
#include "time-util.h"
#include "bus-creds.h"
#include "bus-protocol.h"
@@
-55,10
+54,11
@@
struct bus_container {
struct bus_body_part {
struct bus_body_part *next;
void *data;
struct bus_body_part {
struct bus_body_part *next;
void *data;
+ void *mmap_begin;
size_t size;
size_t mapped;
size_t allocated;
size_t size;
size_t mapped;
size_t allocated;
-
size
_t memfd_offset;
+
uint64
_t memfd_offset;
int memfd;
bool free_this:1;
bool munmap_this:1;
int memfd;
bool free_this:1;
bool munmap_this:1;
@@
-98,7
+98,18
@@
struct sd_bus_message {
bool release_kdbus:1;
bool poisoned:1;
bool release_kdbus:1;
bool poisoned:1;
+ /* The first and last bytes of the message */
struct bus_header *header;
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;
struct bus_body_part body;
struct bus_body_part *body_end;
unsigned n_body_parts;
@@
-111,7
+122,7
@@
struct sd_bus_message {
int *fds;
struct bus_container root_container, *containers;
int *fds;
struct bus_container root_container, *containers;
-
unsigned
n_containers;
+
size_t
n_containers;
size_t containers_allocated;
struct iovec *iovec;
size_t containers_allocated;
struct iovec *iovec;
@@
-137,7
+148,9
@@
struct sd_bus_message {
unsigned n_header_offsets;
};
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;
static inline uint16_t BUS_MESSAGE_BSWAP16(sd_bus_message *m, uint16_t u) {
return BUS_MESSAGE_NEED_BSWAP(m) ? bswap_16(u) : u;
@@
-152,29
+165,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) {
}
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) +
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) +
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) {
}
static inline void* BUS_MESSAGE_FIELDS(sd_bus_message *m) {
@@
-192,7
+199,10
@@
int bus_message_read_strv_extend(sd_bus_message *m, char ***l);
int bus_message_from_header(
sd_bus *bus,
void *header,
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,
int *fds,
unsigned n_fds,
const struct ucred *ucred,
@@
-216,9
+226,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);
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) \
struct bus_body_part *message_append_part(sd_bus_message *m);
#define MESSAGE_FOREACH_PART(part, i, m) \
@@
-234,3
+241,6
@@
int bus_message_new_synthetic_error(sd_bus *bus, uint64_t serial, const sd_bus_e
int bus_message_remarshal(sd_bus *bus, sd_bus_message **m);
int bus_message_append_sender(sd_bus_message *m, const char *sender);
int bus_message_remarshal(sd_bus *bus, sd_bus_message **m);
int bus_message_append_sender(sd_bus_message *m, const char *sender);
+
+void bus_message_set_sender_driver(sd_bus *bus, sd_bus_message *m);
+void bus_message_set_sender_local(sd_bus *bus, sd_bus_message *m);