X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-bus%2Fsd-bus.c;h=251720a6ba7f3efc87cca102fa8c26a633ece970;hp=78e91b96541809ef35e13d0b5edf0ac55ab8c890;hb=356779df90a2ecab5da2cb310ad0f8ebc9ca9f46;hpb=9021bb9f935c93b516b10c88db2a212a9e3a8140 diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 78e91b965..251720a6b 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -129,7 +129,7 @@ static void bus_free(sd_bus *b) { free(b->machine); free(b->fake_label); free(b->cgroup_root); - free(b->connection_name); + free(b->description); free(b->exec_path); strv_free(b->exec_argv); @@ -139,9 +139,10 @@ static void bus_free(sd_bus *b) { bus_reset_queues(b); - hashmap_free_free(b->reply_callbacks); + ordered_hashmap_free_free(b->reply_callbacks); prioq_free(b->reply_callbacks_prioq); + assert(b->match_callbacks.type == BUS_MATCH_ROOT); bus_match_free(&b->match_callbacks); hashmap_free_free(b->vtable_methods); @@ -322,20 +323,20 @@ _public_ int sd_bus_set_trusted(sd_bus *bus, int b) { return 0; } -_public_ int sd_bus_set_name(sd_bus *bus, const char *name) { +_public_ int sd_bus_set_description(sd_bus *bus, const char *description) { char *n; assert_return(bus, -EINVAL); - assert_return(name, -EINVAL); + assert_return(description, -EINVAL); assert_return(bus->state == BUS_UNSET, -EPERM); assert_return(!bus_pid_changed(bus), -ECHILD); - n = strdup(name); + n = strdup(description); if (!n) return -ENOMEM; - free(bus->connection_name); - bus->connection_name = n; + free(bus->description); + bus->description = n; return 0; } @@ -349,8 +350,6 @@ static int hello_callback(sd_bus *bus, sd_bus_message *reply, void *userdata, sd assert(reply); r = sd_bus_message_get_errno(reply); - if (r < 0) - return r; if (r > 0) return -r; @@ -768,7 +767,7 @@ static int parse_container_unix_address(sd_bus *b, const char **p, char **guid) if (!machine) return -EINVAL; - if (!filename_is_safe(machine)) + if (!machine_name_is_valid(machine)) return -EINVAL; free(b->machine); @@ -810,7 +809,7 @@ static int parse_container_kernel_address(sd_bus *b, const char **p, char **guid if (!machine) return -EINVAL; - if (!filename_is_safe(machine)) + if (!machine_name_is_valid(machine)) return -EINVAL; free(b->machine); @@ -1158,13 +1157,13 @@ int bus_set_address_user(sd_bus *b) { return -ENOMEM; #ifdef ENABLE_KDBUS - asprintf(&b->address, KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT, getuid(), ee); + (void) asprintf(&b->address, KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT, getuid(), ee); #else - asprintf(&b->address, UNIX_USER_BUS_FMT, ee); + (void) asprintf(&b->address, UNIX_USER_BUS_FMT, ee); #endif } else { #ifdef ENABLE_KDBUS - asprintf(&b->address, KERNEL_USER_BUS_FMT, getuid()); + (void) asprintf(&b->address, KERNEL_USER_BUS_FMT, getuid()); #else return -ECONNREFUSED; #endif @@ -1306,7 +1305,7 @@ _public_ int sd_bus_open_system_container(sd_bus **ret, const char *machine) { assert_return(machine, -EINVAL); assert_return(ret, -EINVAL); - assert_return(filename_is_safe(machine), -EINVAL); + assert_return(machine_name_is_valid(machine), -EINVAL); r = sd_bus_new(&bus); if (r < 0) @@ -1756,7 +1755,7 @@ _public_ int sd_bus_call_async( if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; - r = hashmap_ensure_allocated(&bus->reply_callbacks, uint64_hash_func, uint64_compare_func); + r = ordered_hashmap_ensure_allocated(&bus->reply_callbacks, &uint64_hash_ops); if (r < 0) return r; @@ -1779,7 +1778,7 @@ _public_ int sd_bus_call_async( s->reply_callback.callback = callback; s->reply_callback.cookie = BUS_MESSAGE_COOKIE(m); - r = hashmap_put(bus->reply_callbacks, &s->reply_callback.cookie, &s->reply_callback); + r = ordered_hashmap_put(bus->reply_callbacks, &s->reply_callback.cookie, &s->reply_callback); if (r < 0) { s->reply_callback.cookie = 0; return r; @@ -2093,7 +2092,7 @@ static int process_timeout(sd_bus *bus) { assert_se(prioq_pop(bus->reply_callbacks_prioq) == c); c->timeout = 0; - hashmap_remove(bus->reply_callbacks, &c->cookie); + ordered_hashmap_remove(bus->reply_callbacks, &c->cookie); c->cookie = 0; slot = container_of(c, sd_bus_slot, reply_callback); @@ -2162,7 +2161,7 @@ static int process_reply(sd_bus *bus, sd_bus_message *m) { if (m->destination && bus->unique_name && !streq_ptr(m->destination, bus->unique_name)) return 0; - c = hashmap_remove(bus->reply_callbacks, &m->reply_cookie); + c = ordered_hashmap_remove(bus->reply_callbacks, &m->reply_cookie); if (!c) return 0; @@ -2496,7 +2495,7 @@ static int process_closing(sd_bus *bus, sd_bus_message **ret) { assert(bus); assert(bus->state == BUS_CLOSING); - c = hashmap_first(bus->reply_callbacks); + c = ordered_hashmap_first(bus->reply_callbacks); if (c) { _cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL; sd_bus_slot *slot; @@ -2519,7 +2518,7 @@ static int process_closing(sd_bus *bus, sd_bus_message **ret) { c->timeout = 0; } - hashmap_remove(bus->reply_callbacks, &c->cookie); + ordered_hashmap_remove(bus->reply_callbacks, &c->cookie); c->cookie = 0; slot = container_of(c, sd_bus_slot, reply_callback); @@ -3016,7 +3015,7 @@ static int attach_io_events(sd_bus *bus) { if (r < 0) return r; - r = sd_event_source_set_name(bus->input_io_event_source, "bus-input"); + r = sd_event_source_set_description(bus->input_io_event_source, "bus-input"); } else r = sd_event_source_set_io_fd(bus->input_io_event_source, bus->input_fd); @@ -3035,7 +3034,7 @@ static int attach_io_events(sd_bus *bus) { if (r < 0) return r; - r = sd_event_source_set_name(bus->input_io_event_source, "bus-output"); + r = sd_event_source_set_description(bus->input_io_event_source, "bus-output"); } else r = sd_event_source_set_io_fd(bus->output_io_event_source, bus->output_fd); @@ -3088,7 +3087,7 @@ _public_ int sd_bus_attach_event(sd_bus *bus, sd_event *event, int priority) { if (r < 0) goto fail; - r = sd_event_source_set_name(bus->time_event_source, "bus-time"); + r = sd_event_source_set_description(bus->time_event_source, "bus-time"); if (r < 0) goto fail; @@ -3096,7 +3095,7 @@ _public_ int sd_bus_attach_event(sd_bus *bus, sd_event *event, int priority) { if (r < 0) goto fail; - r = sd_event_source_set_name(bus->quit_event_source, "bus-exit"); + r = sd_event_source_set_description(bus->quit_event_source, "bus-exit"); if (r < 0) goto fail; @@ -3297,55 +3296,6 @@ _public_ int sd_bus_path_decode(const char *path, const char *prefix, char **ext return 1; } -_public_ int sd_bus_get_peer_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **ret) { - sd_bus_creds *c; - pid_t pid = 0; - int r; - - assert_return(bus, -EINVAL); - assert_return(mask <= _SD_BUS_CREDS_ALL, -ENOTSUP); - assert_return(ret, -EINVAL); - assert_return(!bus_pid_changed(bus), -ECHILD); - - if (bus->is_kernel) - return -ENOTSUP; - - if (!BUS_IS_OPEN(bus->state)) - return -ENOTCONN; - - if (!bus->ucred_valid && !isempty(bus->label)) - return -ENODATA; - - c = bus_creds_new(); - if (!c) - return -ENOMEM; - - if (bus->ucred_valid) { - pid = c->pid = bus->ucred.pid; - c->uid = bus->ucred.uid; - c->gid = bus->ucred.gid; - - c->mask |= (SD_BUS_CREDS_UID | SD_BUS_CREDS_PID | SD_BUS_CREDS_GID) & mask; - } - - if (!isempty(bus->label) && (mask & SD_BUS_CREDS_SELINUX_CONTEXT)) { - c->label = strdup(bus->label); - if (!c->label) { - sd_bus_creds_unref(c); - return -ENOMEM; - } - - c->mask |= SD_BUS_CREDS_SELINUX_CONTEXT; - } - - r = bus_creds_add_more(c, mask, pid, 0); - if (r < 0) - return r; - - *ret = c; - return 0; -} - _public_ int sd_bus_try_close(sd_bus *bus) { int r; @@ -3372,12 +3322,12 @@ _public_ int sd_bus_try_close(sd_bus *bus) { return 0; } -_public_ int sd_bus_get_name(sd_bus *bus, const char **name) { +_public_ int sd_bus_get_description(sd_bus *bus, const char **description) { assert_return(bus, -EINVAL); - assert_return(name, -EINVAL); + assert_return(description, -EINVAL); assert_return(!bus_pid_changed(bus), -ECHILD); - *name = bus->connection_name; + *description = bus->description; return 0; }