X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-control.c;h=0072c37a8cb65b0042ed110b95e52d03a409aa08;hb=815ebc540daf5cede58570bbeb0a4106e201c52e;hp=186724e8ad1f7723ef48cb5986028eb3bba89312;hpb=65dae17a2f890b12a07dd4901b3db02b1031c463;p=elogind.git diff --git a/src/libsystemd-bus/bus-control.c b/src/libsystemd-bus/bus-control.c index 186724e8a..0072c37a8 100644 --- a/src/libsystemd-bus/bus-control.c +++ b/src/libsystemd-bus/bus-control.c @@ -27,7 +27,6 @@ #include #include "strv.h" - #include "sd-bus.h" #include "bus-internal.h" #include "bus-message.h" @@ -50,7 +49,7 @@ _public_ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) { return 0; } -static int bus_request_name_kernel(sd_bus *bus, const char *name, unsigned flags) { +static int bus_request_name_kernel(sd_bus *bus, const char *name, uint64_t flags) { struct kdbus_cmd_name *n; size_t l; int r; @@ -78,14 +77,21 @@ static int bus_request_name_kernel(sd_bus *bus, const char *name, unsigned flags return 1; } -static int bus_request_name_dbus1(sd_bus *bus, const char *name, unsigned flags) { +static int bus_request_name_dbus1(sd_bus *bus, const char *name, uint64_t flags) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - uint32_t ret; + uint32_t ret, param = 0; int r; assert(bus); assert(name); + if (flags & SD_BUS_NAME_ALLOW_REPLACEMENT) + param |= BUS_NAME_ALLOW_REPLACEMENT; + if (flags & SD_BUS_NAME_REPLACE_EXISTING) + param |= BUS_NAME_REPLACE_EXISTING; + if (!(flags & SD_BUS_NAME_QUEUE)) + param |= BUS_NAME_DO_NOT_QUEUE; + r = sd_bus_call_method( bus, "org.freedesktop.DBus", @@ -96,7 +102,7 @@ static int bus_request_name_dbus1(sd_bus *bus, const char *name, unsigned flags) &reply, "su", name, - flags); + param); if (r < 0) return r; @@ -116,13 +122,13 @@ static int bus_request_name_dbus1(sd_bus *bus, const char *name, unsigned flags) return -EIO; } -_public_ int sd_bus_request_name(sd_bus *bus, const char *name, unsigned flags) { +_public_ int sd_bus_request_name(sd_bus *bus, const char *name, uint64_t flags) { assert_return(bus, -EINVAL); assert_return(name, -EINVAL); assert_return(bus->bus_client, -EINVAL); assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); assert_return(!bus_pid_changed(bus), -ECHILD); - assert_return(!(flags & ~(SD_BUS_NAME_ALLOW_REPLACEMENT|SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_DO_NOT_QUEUE)), -EINVAL); + assert_return(!(flags & ~(SD_BUS_NAME_ALLOW_REPLACEMENT|SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_QUEUE)), -EINVAL); if (bus->is_kernel) return bus_request_name_kernel(bus, name, flags); @@ -178,9 +184,9 @@ static int bus_release_name_dbus1(sd_bus *bus, const char *name) { if (r < 0) return r; if (ret == BUS_NAME_NON_EXISTENT) - return -ENOENT; + return -ESRCH; if (ret == BUS_NAME_NOT_OWNER) - return -EADDRNOTAVAIL; + return -EADDRINUSE; if (ret == BUS_NAME_RELEASED) return 0; @@ -204,6 +210,7 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) { struct kdbus_cmd_name_list cmd = {}; struct kdbus_name_list *name_list; struct kdbus_cmd_name *name; + uint64_t previous_id = 0; int r; /* Caller will free half-constructed list on failure... */ @@ -216,13 +223,9 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) { name_list = (struct kdbus_name_list *) ((uint8_t *) bus->kdbus_buffer + cmd.offset); - KDBUS_PART_FOREACH(name, name_list, names) { + KDBUS_ITEM_FOREACH(name, name_list, names) { - if (name->size > sizeof(*name)) { - r = strv_extend(x, name->name); - if (r < 0) - return -ENOMEM; - } else { + if ((flags & KDBUS_NAME_LIST_UNIQUE) && name->id != previous_id) { char *n; if (asprintf(&n, ":1.%llu", (unsigned long long) name->id) < 0) @@ -233,8 +236,15 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) { free(n); return -ENOMEM; } + + previous_id = name->id; } + if (name->size > sizeof(*name)) { + r = strv_extend(x, name->name); + if (r < 0) + return -ENOMEM; + } } r = ioctl(sd_bus_get_fd(bus), KDBUS_CMD_FREE, &cmd.offset); @@ -255,7 +265,7 @@ static int bus_list_names_kernel(sd_bus *bus, char ***acquired, char ***activata } if (activatable) { - r = kernel_get_list(bus, KDBUS_NAME_LIST_STARTERS, &y); + r = kernel_get_list(bus, KDBUS_NAME_LIST_ACTIVATORS, &y); if (r < 0) return r; @@ -383,7 +393,7 @@ static int bus_get_owner_kdbus( c->mask |= SD_BUS_CREDS_UNIQUE_NAME; } - KDBUS_PART_FOREACH(item, conn_info, items) { + KDBUS_ITEM_FOREACH(item, conn_info, items) { switch (item->type) { @@ -439,7 +449,7 @@ static int bus_get_owner_kdbus( case KDBUS_ITEM_CMDLINE: if (mask & SD_BUS_CREDS_CMDLINE) { - c->cmdline_size = item->size - KDBUS_PART_HEADER_SIZE; + c->cmdline_size = item->size - KDBUS_ITEM_HEADER_SIZE; c->cmdline = memdup(item->data, c->cmdline_size); if (!c->cmdline) { r = -ENOMEM; @@ -471,7 +481,7 @@ static int bus_get_owner_kdbus( SD_BUS_CREDS_INHERITABLE_CAPS | SD_BUS_CREDS_BOUNDING_CAPS) & mask; if (m) { - c->capability_size = item->size - KDBUS_PART_HEADER_SIZE; + c->capability_size = item->size - KDBUS_ITEM_HEADER_SIZE; c->capability = memdup(item->data, c->capability_size); if (!c->capability) { r = -ENOMEM; @@ -731,7 +741,7 @@ static int add_name_change_match(sd_bus *bus, return 0; } - if (old_owner) { + if (!isempty(old_owner)) { r = bus_kernel_parse_unique_name(old_owner, &old_owner_id); if (r < 0) return 0; @@ -741,7 +751,7 @@ static int add_name_change_match(sd_bus *bus, return 0; } - if (new_owner) { + if (!isempty(new_owner)) { r = bus_kernel_parse_unique_name(new_owner, &new_owner_id); if (r < 0) return r; @@ -1010,7 +1020,7 @@ static int bus_add_match_internal_kernel( item->type = KDBUS_MATCH_BLOOM; memcpy(item->data64, bloom, BLOOM_SIZE); - item = KDBUS_PART_NEXT(item); + item = KDBUS_ITEM_NEXT(item); } if (sender) {