chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: add macro for iterating through body parts of a message
[elogind.git]
/
src
/
libsystemd-bus
/
bus-message.h
diff --git
a/src/libsystemd-bus/bus-message.h
b/src/libsystemd-bus/bus-message.h
index 8eea46baf17edb35d0b12553682d45db763dc91a..01a1e01230b21ff0088fd22fa2cc8367924da229 100644
(file)
--- a/
src/libsystemd-bus/bus-message.h
+++ b/
src/libsystemd-bus/bus-message.h
@@
-34,10
+34,10
@@
struct bus_container {
char enclosing;
char *signature;
char enclosing;
char *signature;
- unsigned index;
+ unsigned index
, saved_index
;
uint32_t *array_size;
uint32_t *array_size;
- size_t begin;
+ size_t be
fore, be
gin;
};
struct bus_header {
};
struct bus_header {
@@
-50,9
+50,21
@@
struct bus_header {
uint32_t fields_size;
} _packed_;
uint32_t fields_size;
} _packed_;
+struct bus_body_part {
+ void *data;
+ size_t size;
+ size_t mapped;
+ int memfd;
+ bool free_this:1;
+ bool sealed:1;
+ struct bus_body_part *next;
+};
+
struct sd_bus_message {
unsigned n_ref;
struct sd_bus_message {
unsigned n_ref;
+ sd_bus *bus;
+
uint32_t reply_serial;
const char *path;
uint32_t reply_serial;
const char *path;
@@
-68,7
+80,8
@@
struct sd_bus_message {
pid_t pid;
pid_t tid;
usec_t pid_starttime;
pid_t pid;
pid_t tid;
usec_t pid_starttime;
- usec_t timestamp;
+ usec_t monotonic;
+ usec_t realtime;
bool sealed:1;
bool dont_send:1;
bool sealed:1;
bool dont_send:1;
@@
-77,18
+90,22
@@
struct sd_bus_message {
bool gid_valid:1;
bool free_header:1;
bool free_fields:1;
bool gid_valid:1;
bool free_header:1;
bool free_fields:1;
- bool free_body:1;
bool free_kdbus:1;
bool free_fds:1;
bool free_kdbus:1;
bool free_fds:1;
+ bool release_kdbus:1;
+ bool poisoned:1;
struct bus_header *header;
void *fields;
struct bus_header *header;
void *fields;
- void *body;
- struct kdbus_msg *kdbus;
+ struct bus_body_part body;
+ struct bus_body_part *body_end;
+ unsigned n_body_parts;
char *label;
size_t rindex;
char *label;
size_t rindex;
+ struct bus_body_part *cached_rindex_part;
+ size_t cached_rindex_part_begin;
uint32_t n_fds;
int *fds;
uint32_t n_fds;
int *fds;
@@
-96,15
+113,36
@@
struct sd_bus_message {
struct bus_container root_container, *containers;
unsigned n_containers;
struct bus_container root_container, *containers;
unsigned n_containers;
- struct iovec iovec[4];
+ struct iovec *iovec;
+ struct iovec iovec_fixed[3];
unsigned n_iovec;
unsigned n_iovec;
+ struct kdbus_msg *kdbus;
+
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];
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;
+
+ 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)
};
#define BUS_MESSAGE_NEED_BSWAP(m) ((m)->header->endian != SD_BUS_NATIVE_ENDIAN)
@@
-177,3
+215,8
@@
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);
int bus_message_parse_fields(sd_bus_message *m);
int bus_header_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)