#include "bus-internal.h"
#include "bus-message.h"
#include "bus-kernel.h"
+#include "bus-bloom.h"
-#define KDBUS_MSG_FOREACH_DATA(d, k) \
- for ((d) = (k)->data; \
+#define KDBUS_FOREACH_ITEM(i, k) \
+ for ((i) = (k)->items; \
(uint8_t*) (d) < (uint8_t*) (k) + (k)->size; \
- (d) = (struct kdbus_msg_data*) ((uint8_t*) (d) + ALIGN8((d)->size)))
+ (i) = (struct kdbus_msg_data*) ((uint8_t*) (i) + ALIGN8((i)->size)))
static int parse_unique_name(const char *s, uint64_t *id) {
int r;
*d = (struct kdbus_msg_data*) ((uint8_t*) *d + (*d)->size);
}
-static void append_bloom(struct kdbus_msg_data **d, const void *p, size_t length) {
+static void* append_bloom(struct kdbus_msg_data **d, size_t length) {
+ void *r;
+
assert(d);
- assert(p);
*d = ALIGN8_PTR(*d);
(*d)->size = offsetof(struct kdbus_msg_data, data) + length;
(*d)->type = KDBUS_MSG_BLOOM;
- memcpy((*d)->data, p, length);
+ r = (*d)->data;
*d = (struct kdbus_msg_data*) ((uint8_t*) *d + (*d)->size);
+
+ return r;
+}
+
+static int bus_message_setup_bloom(sd_bus_message *m, void *bloom) {
+ unsigned i;
+ int r;
+
+ assert(m);
+ assert(bloom);
+
+ memset(bloom, 0, BLOOM_SIZE);
+
+ bloom_add_pair(bloom, "message-type", bus_message_type_to_string(m->header->type));
+
+ if (m->interface)
+ bloom_add_pair(bloom, "interface", m->interface);
+ if (m->member)
+ bloom_add_pair(bloom, "member", m->member);
+ if (m->path) {
+ bloom_add_pair(bloom, "path", m->path);
+ bloom_add_prefixes(bloom, "path-slash-prefix", m->path, '/');
+ }
+
+ r = sd_bus_message_rewind(m, true);
+ if (r < 0)
+ return r;
+
+ for (i = 0; i < 64; i++) {
+ char type;
+ const char *t;
+ char buf[sizeof("arg")-1 + 2 + sizeof("-slash-prefix")];
+ char *e;
+
+ r = sd_bus_message_peek_type(m, &type, NULL);
+ if (r < 0)
+ return r;
+
+ if (type != SD_BUS_TYPE_STRING &&
+ type != SD_BUS_TYPE_OBJECT_PATH &&
+ type != SD_BUS_TYPE_SIGNATURE)
+ break;
+
+ r = sd_bus_message_read_basic(m, type, &t);
+ if (r < 0)
+ return r;
+
+ e = stpcpy(buf, "arg");
+ if (i < 10)
+ *(e++) = '0' + i;
+ else {
+ *(e++) = '0' + (i / 10);
+ *(e++) = '0' + (i % 10);
+ }
+
+ *e = 0;
+ bloom_add_pair(bloom, buf, t);
+
+ strcpy(e, "-dot-prefix");
+ bloom_add_prefixes(bloom, buf, t, '.');
+ strcpy(e, "-slash-prefix");
+ bloom_add_prefixes(bloom, buf, t, '/');
+ }
+
+ return 0;
}
static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) {
} 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));
/* Add space for bloom filter */
- sz += ALIGN8(offsetof(struct kdbus_msg_data, data) + b->bloom_size);
+ sz += ALIGN8(offsetof(struct kdbus_msg_data, data) + BLOOM_SIZE);
/* Add in well-known destination header */
if (well_known) {
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);
void *p;
/* For now, let's add a mask all bloom filter */
- p = alloca(b->bloom_size);
- memset(p, 0xFF, b->bloom_size);
- append_bloom(&d, p, b->bloom_size);
+ p = append_bloom(&d, BLOOM_SIZE);
+ r = bus_message_setup_bloom(m, p);
+ if (r < 0) {
+ free(m->kdbus);
+ m->kdbus = NULL;
+ return -r;
+ }
}
m->kdbus->size = (uint8_t*) d - (uint8_t*) m->kdbus;
hello.conn_flags > 0xFFFFFFFFULL)
return -ENOTSUP;
+ if (hello.bloom_size != BLOOM_SIZE)
+ return -ENOTSUP;
+
if (asprintf(&b->unique_name, ":1.%llu", (unsigned long long) hello.id) < 0)
return -ENOMEM;
- b->bloom_size = hello.bloom_size;
b->is_kernel = true;
b->bus_client = true;
static void close_kdbus_msg(struct kdbus_msg *k) {
struct kdbus_msg_data *d;
- KDBUS_MSG_FOREACH_DATA(d, k) {
+ KDBUS_FOREACH_ITEM(d, k) {
if (d->type != KDBUS_MSG_UNIX_FDS)
continue;
if (k->payload_type != KDBUS_PAYLOAD_DBUS1)
return 0;
- KDBUS_MSG_FOREACH_DATA(d, k) {
+ KDBUS_FOREACH_ITEM(d, k) {
size_t l;
l = d->size - offsetof(struct kdbus_msg_data, data);
if (r < 0)
return r;
- KDBUS_MSG_FOREACH_DATA(d, k) {
+ KDBUS_FOREACH_ITEM(d, k) {
size_t l;
l = d->size - offsetof(struct kdbus_msg_data, data);
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);
}
return -errno;
l = strlen(name);
- make = alloca(offsetof(struct kdbus_cmd_bus_make, name) + DECIMAL_STR_MAX(uid_t) + 1 + l + 1);
+ make = alloca0(offsetof(struct kdbus_cmd_bus_make, name) + DECIMAL_STR_MAX(uid_t) + 1 + l + 1);
sprintf(make->name, "%lu-%s", (unsigned long) getuid(), name);
make->size = offsetof(struct kdbus_cmd_bus_make, name) + strlen(make->name) + 1;
make->flags = KDBUS_ACCESS_WORLD | KDBUS_POLICY_OPEN;
make->bus_flags = 0;
- make->bloom_size = 16;
+ make->bloom_size = BLOOM_SIZE;
+ make->cgroup_id = 1;
+ assert_cc(BLOOM_SIZE % 8 == 0);
p = strjoin("/dev/kdbus/", make->name, "/bus", NULL);
if (!p)