#include "bus-kernel.h"
#include "bus-bloom.h"
-#define KDBUS_MSG_FOREACH_DATA(d, k) \
- for ((d) = (k)->data; \
- (uint8_t*) (d) < (uint8_t*) (k) + (k)->size; \
- (d) = (struct kdbus_msg_data*) ((uint8_t*) (d) + ALIGN8((d)->size)))
+#define KDBUS_ITEM_NEXT(item) \
+ (typeof(item))(((uint8_t *)item) + ALIGN8((item)->size))
+#define KDBUS_ITEM_FOREACH(item, head) \
+ for (item = (head)->items; \
+ (uint8_t *)(item) < (uint8_t *)(head) + (head)->size; \
+ item = KDBUS_ITEM_NEXT(item))
static int parse_unique_name(const char *s, uint64_t *id) {
int r;
return 1;
}
-static void append_payload_vec(struct kdbus_msg_data **d, const void *p, size_t sz) {
+static void append_payload_vec(struct kdbus_msg_item **d, const void *p, size_t sz) {
assert(d);
assert(p);
assert(sz > 0);
*d = ALIGN8_PTR(*d);
- (*d)->size = offsetof(struct kdbus_msg_data, vec) + sizeof(struct kdbus_vec);
+ (*d)->size = offsetof(struct kdbus_msg_item, vec) + sizeof(struct kdbus_vec);
(*d)->type = KDBUS_MSG_PAYLOAD_VEC;
(*d)->vec.address = (uint64_t) p;
(*d)->vec.size = sz;
- *d = (struct kdbus_msg_data*) ((uint8_t*) *d + (*d)->size);
+ *d = (struct kdbus_msg_item *) ((uint8_t*) *d + (*d)->size);
}
-static void append_destination(struct kdbus_msg_data **d, const char *s, size_t length) {
+static void append_destination(struct kdbus_msg_item **d, const char *s, size_t length) {
assert(d);
assert(s);
*d = ALIGN8_PTR(*d);
- (*d)->size = offsetof(struct kdbus_msg_data, str) + length + 1;
+ (*d)->size = offsetof(struct kdbus_msg_item, str) + length + 1;
(*d)->type = KDBUS_MSG_DST_NAME;
memcpy((*d)->str, s, length + 1);
- *d = (struct kdbus_msg_data*) ((uint8_t*) *d + (*d)->size);
+ *d = (struct kdbus_msg_item *) ((uint8_t*) *d + (*d)->size);
}
-static void* append_bloom(struct kdbus_msg_data **d, size_t length) {
+static void* append_bloom(struct kdbus_msg_item **d, size_t length) {
void *r;
assert(d);
*d = ALIGN8_PTR(*d);
- (*d)->size = offsetof(struct kdbus_msg_data, data) + length;
+ (*d)->size = offsetof(struct kdbus_msg_item, data) + length;
(*d)->type = KDBUS_MSG_BLOOM;
r = (*d)->data;
- *d = (struct kdbus_msg_data*) ((uint8_t*) *d + (*d)->size);
+ *d = (struct kdbus_msg_item *) ((uint8_t*) *d + (*d)->size);
return r;
}
}
static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) {
- struct kdbus_msg_data *d;
+ struct kdbus_msg_item *d;
bool well_known;
uint64_t unique;
size_t sz, dl;
} else
well_known = false;
- sz = offsetof(struct kdbus_msg, data);
+ sz = offsetof(struct kdbus_msg, items);
/* Add in fixed header, fields header and payload */
- sz += 3 * ALIGN8(offsetof(struct kdbus_msg_data, vec) + sizeof(struct kdbus_vec));
+ sz += 3 * ALIGN8(offsetof(struct kdbus_msg_item, vec) + sizeof(struct kdbus_vec));
/* Add space for bloom filter */
- sz += ALIGN8(offsetof(struct kdbus_msg_data, data) + BLOOM_SIZE);
+ sz += ALIGN8(offsetof(struct kdbus_msg_item, data) + BLOOM_SIZE);
/* Add in well-known destination header */
if (well_known) {
dl = strlen(m->destination);
- sz += ALIGN8(offsetof(struct kdbus_msg_data, str) + dl + 1);
+ sz += ALIGN8(offsetof(struct kdbus_msg_item, str) + dl + 1);
}
m->kdbus = aligned_alloc(8, sz);
m->kdbus->timeout_ns = m->timeout * NSEC_PER_USEC;
- d = m->kdbus->data;
+ d = m->kdbus->items;
if (well_known)
append_destination(&d, m->destination, dl);
}
static void close_kdbus_msg(struct kdbus_msg *k) {
- struct kdbus_msg_data *d;
+ struct kdbus_msg_item *d;
- KDBUS_MSG_FOREACH_DATA(d, k) {
+ KDBUS_ITEM_FOREACH(d, k) {
if (d->type != KDBUS_MSG_UNIX_FDS)
continue;
- close_many(d->fds, (d->size - offsetof(struct kdbus_msg_data, fds)) / sizeof(int));
+ close_many(d->fds, (d->size - offsetof(struct kdbus_msg_item, fds)) / sizeof(int));
}
}
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_message **ret) {
sd_bus_message *m = NULL;
- struct kdbus_msg_data *d;
+ struct kdbus_msg_item *d;
unsigned n_payload = 0, n_fds = 0;
_cleanup_free_ int *fds = NULL;
struct bus_header *h = NULL;
if (k->payload_type != KDBUS_PAYLOAD_DBUS1)
return 0;
- KDBUS_MSG_FOREACH_DATA(d, k) {
+ KDBUS_ITEM_FOREACH(d, k) {
size_t l;
- l = d->size - offsetof(struct kdbus_msg_data, data);
+ l = d->size - offsetof(struct kdbus_msg_item, data);
if (d->type == KDBUS_MSG_PAYLOAD) {
if (r < 0)
return r;
- KDBUS_MSG_FOREACH_DATA(d, k) {
+ KDBUS_ITEM_FOREACH(d, k) {
size_t l;
- l = d->size - offsetof(struct kdbus_msg_data, data);
+ l = d->size - offsetof(struct kdbus_msg_item, data);
if (d->type == KDBUS_MSG_PAYLOAD) {
else if (d->type == KDBUS_MSG_SRC_CMDLINE) {
m->cmdline = d->str;
m->cmdline_length = l;
- } else
+ } else if (d->type == KDBUS_MSG_SRC_CGROUP)
+ m->cgroup = d->str;
+ else
log_debug("Got unknown field from kernel %llu", d->type);
}
make->flags = KDBUS_ACCESS_WORLD | KDBUS_POLICY_OPEN;
make->bus_flags = 0;
make->bloom_size = BLOOM_SIZE;
-
+ make->cgroup_id = 1;
assert_cc(BLOOM_SIZE % 8 == 0);
p = strjoin("/dev/kdbus/", make->name, "/bus", NULL);