conn_info = (struct kdbus_conn_info *) ((uint8_t *) bus->kdbus_buffer + cmd->offset);
+ /* Non-activated names are considered not available */
+ if (conn_info->flags & KDBUS_HELLO_ACTIVATOR)
+ return name[0] == ':' ? -ENXIO : -ENOENT;
+
c = bus_creds_new();
if (!c)
return -ENOMEM;
assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
assert_return(!bus_pid_changed(bus), -ECHILD);
assert_return(service_name_is_valid(name), -EINVAL);
+ assert_return(bus->bus_client, -ENODATA);
if (bus->is_kernel)
return bus_get_owner_kdbus(bus, name, mask, creds);
const char *old_owner,
const char *new_owner) {
- uint64_t name_id = 0, old_owner_id = 0, new_owner_id = 0;
+ uint64_t name_id = KDBUS_MATCH_ID_ANY, old_owner_id = 0, new_owner_id = 0;
int is_name_id = -1, r;
struct kdbus_item *item;
/* If we encounter a match that could match against
* NameOwnerChanged messages, then we need to create
- * KDBUS_MATCH_NAME_{ADD,REMOVE,CHANGE} and
- * KDBUS_MATCH_ID_{ADD,REMOVE} matches for it, possibly
+ * KDBUS_ITEM_NAME_{ADD,REMOVE,CHANGE} and
+ * KDBUS_ITEM_ID_{ADD,REMOVE} matches for it, possibly
* multiple if the match is underspecified.
*
* The NameOwnerChanged signals take three parameters with
* unique or well-known names, but only some forms actually
* exist:
*
- * WELLKNOWN, "", UNIQUE → KDBUS_MATCH_NAME_ADD
- * WELLKNOWN, UNIQUE, "" → KDBUS_MATCH_NAME_REMOVE
- * WELLKNOWN, UNIQUE, UNIQUE → KDBUS_MATCH_NAME_CHANGE
- * UNIQUE, "", UNIQUE → KDBUS_MATCH_ID_ADD
- * UNIQUE, UNIQUE, "" → KDBUS_MATCH_ID_REMOVE
+ * WELLKNOWN, "", UNIQUE → KDBUS_ITEM_NAME_ADD
+ * WELLKNOWN, UNIQUE, "" → KDBUS_ITEM_NAME_REMOVE
+ * WELLKNOWN, UNIQUE, UNIQUE → KDBUS_ITEM_NAME_CHANGE
+ * UNIQUE, "", UNIQUE → KDBUS_ITEM_ID_ADD
+ * UNIQUE, UNIQUE, "" → KDBUS_ITEM_ID_REMOVE
*
* For the latter two the two unique names must be identical.
*
return 0;
if (is_name_id > 0 && old_owner_id != name_id)
return 0;
- }
+ } else
+ old_owner_id = KDBUS_MATCH_ID_ANY;
if (!isempty(new_owner)) {
r = bus_kernel_parse_unique_name(new_owner, &new_owner_id);
return 0;
if (is_name_id > 0 && new_owner_id != name_id)
return 0;
- }
+ } else
+ new_owner_id = KDBUS_MATCH_ID_ANY;
if (is_name_id <= 0) {
struct kdbus_cmd_match *m;
size_t sz, l;
/* If the name argument is missing or is a well-known
- * name, then add KDBUS_MATCH_NAME_{ADD,REMOVE,CHANGE}
+ * name, then add KDBUS_ITEM_NAME_{ADD,REMOVE,CHANGE}
* matches for it */
l = name ? strlen(name) + 1 : 0;
m = alloca0(sz);
m->size = sz;
m->cookie = cookie;
- m->src_id = KDBUS_SRC_ID_KERNEL;
item = m->items;
item->size =
/* If the old name is unset or empty, then
* this can match against added names */
if (!old_owner || old_owner[0] == 0) {
- item->type = KDBUS_MATCH_NAME_ADD;
+ item->type = KDBUS_ITEM_NAME_ADD;
r = ioctl(bus->input_fd, KDBUS_CMD_MATCH_ADD, m);
if (r < 0)
/* If the new name is unset or empty, then
* this can match against removed names */
if (!new_owner || new_owner[0] == 0) {
- item->type = KDBUS_MATCH_NAME_REMOVE;
+ item->type = KDBUS_ITEM_NAME_REMOVE;
r = ioctl(bus->input_fd, KDBUS_CMD_MATCH_ADD, m);
if (r < 0)
return -errno;
}
- /* If the neither name is explicitly set to
- * the empty string, then this can match
- * agains changed names */
- if (!(old_owner && old_owner[0] == 0) &&
- !(new_owner && new_owner[0] == 0)) {
- item->type = KDBUS_MATCH_NAME_CHANGE;
-
- r = ioctl(bus->input_fd, KDBUS_CMD_MATCH_ADD, m);
- if (r < 0)
- return -errno;
- }
+ /* The CHANGE match we need in either case, because
+ * what is reported as a name change by the kernel
+ * might just be an owner change between starter and
+ * normal clients. For userspace such a change should
+ * be considered a removal/addition, hence let's
+ * subscribe to this unconditionally. */
+ item->type = KDBUS_ITEM_NAME_CHANGE;
+ r = ioctl(bus->input_fd, KDBUS_CMD_MATCH_ADD, m);
+ if (r < 0)
+ return -errno;
}
if (is_name_id != 0) {
uint64_t sz;
/* If the name argument is missing or is a unique
- * name, then add KDBUS_MATCH_ID_{ADD,REMOVE} matches
+ * name, then add KDBUS_ITEM_ID_{ADD,REMOVE} matches
* for it */
sz = ALIGN8(offsetof(struct kdbus_cmd_match, items) +
m = alloca0(sz);
m->size = sz;
m->cookie = cookie;
- m->src_id = KDBUS_SRC_ID_KERNEL;
item = m->items;
item->size = offsetof(struct kdbus_item, id_change) + sizeof(struct kdbus_notify_id_change);
- /* item->id_change.id = name_id; */
+ item->id_change.id = name_id;
/* If the old name is unset or empty, then this can
* match against added ids */
if (!old_owner || old_owner[0] == 0) {
- item->type = KDBUS_MATCH_ID_ADD;
+ item->type = KDBUS_ITEM_ID_ADD;
r = ioctl(bus->input_fd, KDBUS_CMD_MATCH_ADD, m);
if (r < 0)
}
/* If thew new name is unset or empty, then this can
- match against removed ids */
+ * match against removed ids */
if (!new_owner || new_owner[0] == 0) {
- item->type = KDBUS_MATCH_ID_REMOVE;
+ item->type = KDBUS_ITEM_ID_REMOVE;
r = ioctl(bus->input_fd, KDBUS_CMD_MATCH_ADD, m);
if (r < 0)
size_t sz;
const char *sender = NULL;
size_t sender_length = 0;
- uint64_t src_id = KDBUS_MATCH_SRC_ID_ANY;
+ uint64_t src_id = KDBUS_MATCH_ID_ANY;
bool using_bloom = false;
unsigned i;
bool matches_name_change = true;
zero(bloom);
- sz = offsetof(struct kdbus_cmd_match, items);
+ sz = ALIGN8(offsetof(struct kdbus_cmd_match, items) +
+ offsetof(struct kdbus_item, id) + sizeof(uint64_t));
for (i = 0; i < n_components; i++) {
struct bus_match_component *c = &components[i];
m = alloca0(sz);
m->size = sz;
m->cookie = cookie;
- m->src_id = src_id;
m->id = id;
item = m->items;
+ item->size = offsetof(struct kdbus_item, id) + sizeof(uint64_t);
+ item->type = KDBUS_ITEM_ID;
+ item->id = src_id;
if (using_bloom) {
+ item = KDBUS_ITEM_NEXT(item);
item->size = offsetof(struct kdbus_item, data64) + BLOOM_SIZE;
- item->type = KDBUS_MATCH_BLOOM;
+ item->type = KDBUS_ITEM_BLOOM;
memcpy(item->data64, bloom, BLOOM_SIZE);
-
- item = KDBUS_ITEM_NEXT(item);
}
if (sender) {
+ item = KDBUS_ITEM_NEXT(item);
item->size = offsetof(struct kdbus_item, str) + sender_length + 1;
- item->type = KDBUS_MATCH_SRC_NAME;
+ item->type = KDBUS_ITEM_NAME;
memcpy(item->str, sender, sender_length + 1);
}