#include <sys/mman.h>
#include "util.h"
+#include "strv.h"
#include "bus-internal.h"
#include "bus-message.h"
off = (uint8_t *)k - (uint8_t *)bus->kdbus_buffer;
ioctl(bus->input_fd, KDBUS_CMD_FREE, &off);
- KDBUS_PART_FOREACH(d, k, items) {
+ KDBUS_ITEM_FOREACH(d, k, items) {
if (d->type == KDBUS_ITEM_FDS)
close_many(d->fds, (d->size - offsetof(struct kdbus_item, fds)) / sizeof(int));
assert(k);
assert(k->payload_type == KDBUS_PAYLOAD_KERNEL);
- KDBUS_PART_FOREACH(d, k, items) {
+ KDBUS_ITEM_FOREACH(d, k, items) {
if (d->type >= _KDBUS_ITEM_KERNEL_BASE && d->type < _KDBUS_ITEM_KERNEL_BASE + ELEMENTSOF(translate)) {
if (found)
return -EBADMSG;
assert(k);
assert(k->payload_type == KDBUS_PAYLOAD_DBUS1);
- KDBUS_PART_FOREACH(d, k, items) {
+ KDBUS_ITEM_FOREACH(d, k, items) {
size_t l;
l = d->size - offsetof(struct kdbus_item, data);
if (r < 0)
return r;
- KDBUS_PART_FOREACH(d, k, items) {
+ KDBUS_ITEM_FOREACH(d, k, items) {
size_t l;
l = d->size - offsetof(struct kdbus_item, data);
destination = d->str;
break;
- case KDBUS_ITEM_NAMES:
- m->creds.well_known_names = d->str;
- m->creds.well_known_names_size = l;
+ case KDBUS_ITEM_NAME:
+ r = strv_extend(&m->creds.well_known_names, d->name.name);
+ if (r < 0)
+ goto fail;
m->creds.mask |= SD_BUS_CREDS_WELL_KNOWN_NAMES & bus->creds_mask;
break;
make->size = ALIGN8(offsetof(struct kdbus_cmd_bus_make, items) + n->size);
make->flags = KDBUS_MAKE_POLICY_OPEN;
- make->bus_flags = 0;
make->bloom_size = BLOOM_SIZE;
assert_cc(BLOOM_SIZE % 8 == 0);