X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fsd-bus.c;h=76a27ec3c7bc3c496e98b12ce26e43d2d278f80f;hp=2424ee14465bb69737f8b4281ec226c6839672fa;hb=821e0756c62d705252ab13d24af941578c0b9642;hpb=e9a967f9a0e9b2bf705a776c34635e6d1df73f1b diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index 2424ee144..76a27ec3c 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -26,11 +26,14 @@ #include #include #include +#include +#include #include "util.h" #include "macro.h" #include "strv.h" #include "set.h" +#include "missing.h" #include "sd-bus.h" #include "bus-internal.h" @@ -39,23 +42,105 @@ #include "bus-socket.h" #include "bus-kernel.h" #include "bus-control.h" +#include "bus-introspect.h" +#include "bus-signature.h" +#include "bus-objects.h" +#include "bus-util.h" +#include "bus-container.h" +#include "bus-protocol.h" static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec); +static int attach_io_events(sd_bus *b); +static void detach_io_events(sd_bus *b); + +static void bus_close_fds(sd_bus *b) { + assert(b); + + detach_io_events(b); + + if (b->input_fd >= 0) + close_nointr_nofail(b->input_fd); + + if (b->output_fd >= 0 && b->output_fd != b->input_fd) + close_nointr_nofail(b->output_fd); + + b->input_fd = b->output_fd = -1; +} + +static void bus_node_destroy(sd_bus *b, struct node *n) { + struct node_callback *c; + struct node_vtable *v; + struct node_enumerator *e; + + assert(b); + + if (!n) + return; + + while (n->child) + bus_node_destroy(b, n->child); + + while ((c = n->callbacks)) { + LIST_REMOVE(callbacks, n->callbacks, c); + free(c); + } + + while ((v = n->vtables)) { + LIST_REMOVE(vtables, n->vtables, v); + free(v->interface); + free(v); + } + + while ((e = n->enumerators)) { + LIST_REMOVE(enumerators, n->enumerators, e); + free(e); + } + + if (n->parent) + LIST_REMOVE(siblings, n->parent->child, n); + + assert_se(hashmap_remove(b->nodes, n->path) == n); + free(n->path); + free(n); +} + +static void bus_reset_queues(sd_bus *b) { + unsigned i; + + assert(b); + + for (i = 0; i < b->rqueue_size; i++) + sd_bus_message_unref(b->rqueue[i]); + free(b->rqueue); + + for (i = 0; i < b->wqueue_size; i++) + sd_bus_message_unref(b->wqueue[i]); + free(b->wqueue); + + b->rqueue = b->wqueue = NULL; + b->rqueue_allocated = b->wqueue_allocated = 0; + b->rqueue_size = b->wqueue_size = 0; +} static void bus_free(sd_bus *b) { struct filter_callback *f; - struct object_callback *c; - unsigned i; + struct node *n; assert(b); - sd_bus_close(b); + sd_bus_detach_event(b); + + bus_close_fds(b); + + if (b->kdbus_buffer) + munmap(b->kdbus_buffer, KDBUS_POOL_SIZE); free(b->rbuffer); free(b->unique_name); free(b->auth_buffer); free(b->address); free(b->kernel); + free(b->machine); free(b->exec_path); strv_free(b->exec_argv); @@ -63,53 +148,55 @@ static void bus_free(sd_bus *b) { close_many(b->fds, b->n_fds); free(b->fds); - for (i = 0; i < b->rqueue_size; i++) - sd_bus_message_unref(b->rqueue[i]); - free(b->rqueue); - - for (i = 0; i < b->wqueue_size; i++) - sd_bus_message_unref(b->wqueue[i]); - free(b->wqueue); + bus_reset_queues(b); hashmap_free_free(b->reply_callbacks); prioq_free(b->reply_callbacks_prioq); while ((f = b->filter_callbacks)) { - LIST_REMOVE(struct filter_callback, callbacks, b->filter_callbacks, f); + LIST_REMOVE(callbacks, b->filter_callbacks, f); free(f); } - while ((c = hashmap_steal_first(b->object_callbacks))) { - free(c->path); - free(c); - } + bus_match_free(&b->match_callbacks); - hashmap_free(b->object_callbacks); + hashmap_free_free(b->vtable_methods); + hashmap_free_free(b->vtable_properties); - bus_match_free(&b->match_callbacks); + while ((n = hashmap_first(b->nodes))) + bus_node_destroy(b, n); + + hashmap_free(b->nodes); + + bus_kernel_flush_memfd(b); + + assert_se(pthread_mutex_destroy(&b->memfd_cache_mutex) == 0); free(b); } -int sd_bus_new(sd_bus **ret) { +_public_ int sd_bus_new(sd_bus **ret) { sd_bus *r; - if (!ret) - return -EINVAL; + assert_return(ret, -EINVAL); r = new0(sd_bus, 1); if (!r) return -ENOMEM; - r->n_ref = 1; + r->n_ref = REFCNT_INIT; r->input_fd = r->output_fd = -1; r->message_version = 1; - r->negotiate_fds = true; + r->creds_mask |= SD_BUS_CREDS_WELL_KNOWN_NAMES|SD_BUS_CREDS_UNIQUE_NAME; + r->hello_flags |= KDBUS_HELLO_ACCEPT_FD; + r->attach_flags |= KDBUS_ATTACH_NAMES; + r->original_pid = getpid(); + + assert_se(pthread_mutex_init(&r->memfd_cache_mutex, NULL) == 0); /* We guarantee that wqueue always has space for at least one * entry */ - r->wqueue = new(sd_bus_message*, 1); - if (!r->wqueue) { + if (!GREEDY_REALLOC(r->wqueue, r->wqueue_allocated, 1)) { free(r); return -ENOMEM; } @@ -118,15 +205,13 @@ int sd_bus_new(sd_bus **ret) { return 0; } -int sd_bus_set_address(sd_bus *bus, const char *address) { +_public_ int sd_bus_set_address(sd_bus *bus, const char *address) { char *a; - if (!bus) - return -EINVAL; - if (bus->state != BUS_UNSET) - return -EPERM; - if (!address) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(address, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); a = strdup(address); if (!a) @@ -138,32 +223,26 @@ int sd_bus_set_address(sd_bus *bus, const char *address) { return 0; } -int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) { - if (!bus) - return -EINVAL; - if (bus->state != BUS_UNSET) - return -EPERM; - if (input_fd < 0) - return -EINVAL; - if (output_fd < 0) - return -EINVAL; +_public_ int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(input_fd >= 0, -EINVAL); + assert_return(output_fd >= 0, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); bus->input_fd = input_fd; bus->output_fd = output_fd; return 0; } -int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) { +_public_ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) { char *p, **a; - if (!bus) - return -EINVAL; - if (bus->state != BUS_UNSET) - return -EPERM; - if (!path) - return -EINVAL; - if (strv_isempty(argv)) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(path, -EINVAL); + assert_return(!strv_isempty(argv), -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); p = strdup(path); if (!p) @@ -184,61 +263,88 @@ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) { return 0; } -int sd_bus_set_bus_client(sd_bus *bus, int b) { - if (!bus) - return -EINVAL; - if (bus->state != BUS_UNSET) - return -EPERM; +_public_ int sd_bus_set_bus_client(sd_bus *bus, int b) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); bus->bus_client = !!b; return 0; } -int sd_bus_set_negotiate_fds(sd_bus *bus, int b) { - if (!bus) - return -EINVAL; - if (bus->state != BUS_UNSET) - return -EPERM; +_public_ int sd_bus_negotiate_fds(sd_bus *bus, int b) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); - bus->negotiate_fds = !!b; + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ACCEPT_FD, b); return 0; } -int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id) { - if (!bus) - return -EINVAL; - if (!b && !sd_id128_equal(server_id, SD_ID128_NULL)) - return -EINVAL; - if (bus->state != BUS_UNSET) - return -EPERM; +_public_ int sd_bus_negotiate_attach_timestamp(sd_bus *bus, int b) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); + + SET_FLAG(bus->attach_flags, KDBUS_ATTACH_TIMESTAMP, b); + return 0; +} + +_public_ int sd_bus_negotiate_attach_creds(sd_bus *bus, uint64_t mask) { + assert_return(bus, -EINVAL); + assert_return(mask <= _SD_BUS_CREDS_ALL, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); + + /* The well knowns we need unconditionally, so that matches can work */ + bus->creds_mask = mask | SD_BUS_CREDS_WELL_KNOWN_NAMES|SD_BUS_CREDS_UNIQUE_NAME; + + return kdbus_translate_attach_flags(bus->creds_mask, &bus->creds_mask); +} + +_public_ int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id) { + assert_return(bus, -EINVAL); + assert_return(b || sd_id128_equal(server_id, SD_ID128_NULL), -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); bus->is_server = !!b; bus->server_id = server_id; return 0; } -int sd_bus_set_anonymous(sd_bus *bus, int b) { - if (!bus) - return -EINVAL; - if (bus->state != BUS_UNSET) - return -EPERM; +_public_ int sd_bus_set_anonymous(sd_bus *bus, int b) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); bus->anonymous_auth = !!b; return 0; } -static int hello_callback(sd_bus *bus, int error, sd_bus_message *reply, void *userdata) { +_public_ int sd_bus_set_trusted(sd_bus *bus, int b) { + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); + + bus->trusted = !!b; + return 0; +} + +static int hello_callback(sd_bus *bus, sd_bus_message *reply, void *userdata, sd_bus_error *error) { const char *s; int r; assert(bus); - assert(bus->state == BUS_HELLO); - - if (error != 0) - return -error; - + assert(bus->state == BUS_HELLO || bus->state == BUS_CLOSING); assert(reply); + r = sd_bus_message_get_errno(reply); + if (r < 0) + return r; + if (r > 0) + return -r; + r = sd_bus_message_read(reply, "s", &s); if (r < 0) return r; @@ -250,7 +356,8 @@ static int hello_callback(sd_bus *bus, int error, sd_bus_message *reply, void *u if (!bus->unique_name) return -ENOMEM; - bus->state = BUS_RUNNING; + if (bus->state == BUS_HELLO) + bus->state = BUS_RUNNING; return 1; } @@ -274,13 +381,13 @@ static int bus_send_hello(sd_bus *bus) { if (r < 0) return r; - return sd_bus_send_with_reply(bus, m, hello_callback, NULL, 0, &bus->hello_serial); + return sd_bus_call_async(bus, m, hello_callback, NULL, 0, &bus->hello_serial); } int bus_start_running(sd_bus *bus) { assert(bus); - if (bus->bus_client) { + if (bus->bus_client && !bus->is_kernel) { bus->state = BUS_HELLO; return 1; } @@ -290,7 +397,7 @@ int bus_start_running(sd_bus *bus) { } static int parse_address_key(const char **p, const char *key, char **value) { - size_t l, n = 0; + size_t l, n = 0, allocated = 0; const char *a; char *r = NULL; @@ -314,7 +421,7 @@ static int parse_address_key(const char **p, const char *key, char **value) { a = *p; while (*a != ';' && *a != ',' && *a != 0) { - char c, *t; + char c; if (*a == '%') { int x, y; @@ -338,13 +445,9 @@ static int parse_address_key(const char **p, const char *key, char **value) { a++; } - t = realloc(r, n + 2); - if (!t) { - free(r); + if (!GREEDY_REALLOC(r, allocated, n + 2)) return -ENOMEM; - } - r = t; r[n++] = c; } @@ -507,6 +610,7 @@ static int parse_exec_address(sd_bus *b, const char **p, char **guid) { char *path = NULL; unsigned n_argv = 0, j; char **argv = NULL; + size_t allocated = 0; int r; assert(b); @@ -540,17 +644,11 @@ static int parse_exec_address(sd_bus *b, const char **p, char **guid) { (*p) ++; if (ul >= n_argv) { - char **x; - - x = realloc(argv, sizeof(char*) * (ul + 2)); - if (!x) { + if (!GREEDY_REALLOC0(argv, allocated, ul + 2)) { r = -ENOMEM; goto fail; } - memset(x + n_argv, 0, sizeof(char*) * (ul - n_argv + 2)); - - argv = x; n_argv = ul + 1; } @@ -633,6 +731,91 @@ static int parse_kernel_address(sd_bus *b, const char **p, char **guid) { return 0; } +static int parse_container_unix_address(sd_bus *b, const char **p, char **guid) { + _cleanup_free_ char *machine = NULL; + int r; + + assert(b); + assert(p); + assert(*p); + assert(guid); + + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + return r; + else if (r > 0) + continue; + + r = parse_address_key(p, "machine", &machine); + if (r < 0) + return r; + else if (r > 0) + continue; + + skip_address_key(p); + } + + if (!machine) + return -EINVAL; + + if (!filename_is_safe(machine)) + return -EINVAL; + + free(b->machine); + b->machine = machine; + machine = NULL; + + b->sockaddr.un.sun_family = AF_UNIX; + strncpy(b->sockaddr.un.sun_path, "/var/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path)); + b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + sizeof("/var/run/dbus/system_bus_socket") - 1; + + return 0; +} + +static int parse_container_kernel_address(sd_bus *b, const char **p, char **guid) { + _cleanup_free_ char *machine = NULL; + int r; + + assert(b); + assert(p); + assert(*p); + assert(guid); + + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + return r; + else if (r > 0) + continue; + + r = parse_address_key(p, "machine", &machine); + if (r < 0) + return r; + else if (r > 0) + continue; + + skip_address_key(p); + } + + if (!machine) + return -EINVAL; + + if (!filename_is_safe(machine)) + return -EINVAL; + + free(b->machine); + b->machine = machine; + machine = NULL; + + free(b->kernel); + b->kernel = strdup("/dev/kdbus/0-system/bus"); + if (!b->kernel) + return -ENOMEM; + + return 0; +} + static void bus_reset_parsed_address(sd_bus *b) { assert(b); @@ -645,6 +828,8 @@ static void bus_reset_parsed_address(sd_bus *b) { b->server_id = SD_ID128_NULL; free(b->kernel); b->kernel = NULL; + free(b->machine); + b->machine = NULL; } static int bus_parse_next_address(sd_bus *b) { @@ -703,6 +888,22 @@ static int bus_parse_next_address(sd_bus *b) { if (r < 0) return r; + break; + } else if (startswith(a, "x-container-unix:")) { + + a += 17; + r = parse_container_unix_address(b, &a, &guid); + if (r < 0) + return r; + + break; + } else if (startswith(a, "x-container-kernel:")) { + + a += 19; + r = parse_container_kernel_address(b, &a, &guid); + if (r < 0) + return r; + break; } @@ -727,28 +928,29 @@ static int bus_start_address(sd_bus *b) { assert(b); for (;;) { - sd_bus_close(b); - - if (b->sockaddr.sa.sa_family != AF_UNSPEC) { - - r = bus_socket_connect(b); - if (r >= 0) - return r; - - b->last_connect_error = -r; + bool skipped = false; - } else if (b->exec_path) { + bus_close_fds(b); + if (b->exec_path) r = bus_socket_exec(b); - if (r >= 0) - return r; - - b->last_connect_error = -r; - } else if (b->kernel) { - + else if (b->machine && b->kernel) + r = bus_container_connect_kernel(b); + else if (b->machine && b->sockaddr.sa.sa_family != AF_UNSPEC) + r = bus_container_connect_socket(b); + else if (b->kernel) r = bus_kernel_connect(b); - if (r >= 0) - return r; + else if (b->sockaddr.sa.sa_family != AF_UNSPEC) + r = bus_socket_connect(b); + else + skipped = true; + + if (!skipped) { + if (r >= 0) { + r = attach_io_events(b); + if (r >= 0) + return r; + } b->last_connect_error = -r; } @@ -803,13 +1005,12 @@ static int bus_start_fd(sd_bus *b) { return bus_socket_take_fd(b); } -int sd_bus_start(sd_bus *bus) { +_public_ int sd_bus_start(sd_bus *bus) { int r; - if (!bus) - return -EINVAL; - if (bus->state != BUS_UNSET) - return -EPERM; + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); bus->state = BUS_OPENING; @@ -818,7 +1019,7 @@ int sd_bus_start(sd_bus *bus) { if (bus->input_fd >= 0) r = bus_start_fd(bus); - else if (bus->address || bus->sockaddr.sa.sa_family != AF_UNSPEC || bus->exec_path || bus->kernel) + else if (bus->address || bus->sockaddr.sa.sa_family != AF_UNSPEC || bus->exec_path || bus->kernel || bus->machine) r = bus_start_address(bus); else return -EINVAL; @@ -829,31 +1030,37 @@ int sd_bus_start(sd_bus *bus) { return bus_send_hello(bus); } -int sd_bus_open_system(sd_bus **ret) { +_public_ int sd_bus_open_system(sd_bus **ret) { const char *e; sd_bus *b; int r; - if (!ret) - return -EINVAL; + assert_return(ret, -EINVAL); r = sd_bus_new(&b); if (r < 0) return r; - e = getenv("DBUS_SYSTEM_BUS_ADDRESS"); - if (e) { + e = secure_getenv("DBUS_SYSTEM_BUS_ADDRESS"); + if (e) r = sd_bus_set_address(b, e); - if (r < 0) - goto fail; - } else { - b->sockaddr.un.sun_family = AF_UNIX; - strncpy(b->sockaddr.un.sun_path, "/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path)); - b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + sizeof("/run/dbus/system_bus_socket") - 1; - } + else +#ifdef ENABLE_KDBUS + r = sd_bus_set_address(b, "kernel:path=/dev/kdbus/0-system/bus;unix:path=/run/dbus/system_bus_socket"); +#else + r = sd_bus_set_address(b, "unix:path=/run/dbus/system_bus_socket"); +#endif + + if (r < 0) + goto fail; b->bus_client = true; + /* Let's do per-method access control on the system bus. We + * need the caller's UID and capability set for that. */ + b->trusted = false; + b->attach_flags |= KDBUS_ATTACH_CAPS | KDBUS_ATTACH_CREDS; + r = sd_bus_start(b); if (r < 0) goto fail; @@ -866,44 +1073,58 @@ fail: return r; } -int sd_bus_open_user(sd_bus **ret) { +_public_ int sd_bus_open_user(sd_bus **ret) { const char *e; sd_bus *b; - size_t l; int r; - if (!ret) - return -EINVAL; + assert_return(ret, -EINVAL); r = sd_bus_new(&b); if (r < 0) return r; - e = getenv("DBUS_SESSION_BUS_ADDRESS"); + e = secure_getenv("DBUS_SESSION_BUS_ADDRESS"); if (e) { r = sd_bus_set_address(b, e); if (r < 0) goto fail; } else { - e = getenv("XDG_RUNTIME_DIR"); - if (!e) { - r = -ENOENT; - goto fail; + e = secure_getenv("XDG_RUNTIME_DIR"); + if (e) { + _cleanup_free_ char *ee = NULL; + + ee = bus_address_escape(e); + if (!ee) { + r = -ENOMEM; + goto fail; + } + +#ifdef ENABLE_KDBUS + asprintf(&b->address, "kernel:path=/dev/kdbus/%lu-user/bus;unix:path=%s/bus", (unsigned long) getuid(), ee); +#else + b->address = strjoin("unix:path=", ee, "/bus", NULL); +#endif + } else { +#ifdef ENABLE_KDBUS + asprintf(&b->address, "kernel:path=/dev/kdbus/%lu-user/bus", (unsigned long) getuid()); +#else + return -ECONNREFUSED; +#endif } - l = strlen(e); - if (l + 4 > sizeof(b->sockaddr.un.sun_path)) { - r = -E2BIG; + if (!b->address) { + r = -ENOMEM; goto fail; } - - b->sockaddr.un.sun_family = AF_UNIX; - memcpy(mempcpy(b->sockaddr.un.sun_path, e, l), "/bus", 4); - b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + l + 4; } b->bus_client = true; + /* We don't do any per-method access control on the user + * bus. */ + b->trusted = true; + r = sd_bus_start(b); if (r < 0) goto fail; @@ -916,58 +1137,157 @@ fail: return r; } -void sd_bus_close(sd_bus *bus) { - if (!bus) - return; - - if (bus->input_fd >= 0) - close_nointr_nofail(bus->input_fd); - if (bus->output_fd >= 0 && bus->output_fd != bus->input_fd) - close_nointr_nofail(bus->output_fd); - - bus->input_fd = bus->output_fd = -1; -} +_public_ int sd_bus_open_system_remote(const char *host, sd_bus **ret) { + _cleanup_free_ char *e = NULL; + char *p = NULL; + sd_bus *bus; + int r; -sd_bus *sd_bus_ref(sd_bus *bus) { - if (!bus) - return NULL; + assert_return(host, -EINVAL); + assert_return(ret, -EINVAL); - assert(bus->n_ref > 0); + e = bus_address_escape(host); + if (!e) + return -ENOMEM; - bus->n_ref++; - return bus; -} + p = strjoin("unixexec:path=ssh,argv1=-xT,argv2=", e, ",argv3=systemd-stdio-bridge", NULL); + if (!p) + return -ENOMEM; -sd_bus *sd_bus_unref(sd_bus *bus) { - if (!bus) - return NULL; + r = sd_bus_new(&bus); + if (r < 0) { + free(p); + return r; + } - assert(bus->n_ref > 0); - bus->n_ref--; + bus->address = p; + bus->bus_client = true; - if (bus->n_ref <= 0) + r = sd_bus_start(bus); + if (r < 0) { bus_free(bus); + return r; + } - return NULL; -} - -int sd_bus_is_open(sd_bus *bus) { - if (!bus) - return -EINVAL; - - return bus->state != BUS_UNSET && bus->input_fd >= 0; + *ret = bus; + return 0; } -int sd_bus_can_send(sd_bus *bus, char type) { +_public_ int sd_bus_open_system_container(const char *machine, sd_bus **ret) { + _cleanup_free_ char *e = NULL; + sd_bus *bus; + char *p; int r; + assert_return(machine, -EINVAL); + assert_return(ret, -EINVAL); + assert_return(filename_is_safe(machine), -EINVAL); + + e = bus_address_escape(machine); + if (!e) + return -ENOMEM; + +#ifdef ENABLE_KDBUS + p = strjoin("x-container-kernel:machine=", e, ";x-container-unix:machine=", e, NULL); +#else + p = strjoin("x-container-unix:machine=", e, NULL); +#endif + if (!p) + return -ENOMEM; + + r = sd_bus_new(&bus); + if (r < 0) { + free(p); + return r; + } + + bus->address = p; + bus->bus_client = true; + + r = sd_bus_start(bus); + if (r < 0) { + bus_free(bus); + return r; + } + + *ret = bus; + return 0; +} + +_public_ void sd_bus_close(sd_bus *bus) { + if (!bus) - return -EINVAL; - if (bus->output_fd < 0) - return -ENOTCONN; + return; + if (bus->state == BUS_CLOSED) + return; + if (bus_pid_changed(bus)) + return; + + bus->state = BUS_CLOSED; + + sd_bus_detach_event(bus); + + /* Drop all queued messages so that they drop references to + * the bus object and the bus may be freed */ + bus_reset_queues(bus); + + if (!bus->is_kernel) + bus_close_fds(bus); + + /* We'll leave the fd open in case this is a kernel bus, since + * there might still be memblocks around that reference this + * bus, and they might need to invoke the * KDBUS_CMD_FREE + * ioctl on the fd when they are freed. */ +} + +static void bus_enter_closing(sd_bus *bus) { + assert(bus); + + if (bus->state != BUS_OPENING && + bus->state != BUS_AUTHENTICATING && + bus->state != BUS_HELLO && + bus->state != BUS_RUNNING) + return; + + bus->state = BUS_CLOSING; +} + +_public_ sd_bus *sd_bus_ref(sd_bus *bus) { + assert_return(bus, NULL); + + assert_se(REFCNT_INC(bus->n_ref) >= 2); + + return bus; +} + +_public_ sd_bus *sd_bus_unref(sd_bus *bus) { + + if (!bus) + return NULL; + + if (REFCNT_DEC(bus->n_ref) <= 0) + bus_free(bus); + + return NULL; +} + +_public_ int sd_bus_is_open(sd_bus *bus) { + + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + return BUS_IS_OPEN(bus->state); +} + +_public_ int sd_bus_can_send(sd_bus *bus, char type) { + int r; + + assert_return(bus, -EINVAL); + assert_return(bus->state != BUS_UNSET, -ENOTCONN); + assert_return(!bus_pid_changed(bus), -ECHILD); if (type == SD_BUS_TYPE_UNIX_FD) { - if (!bus->negotiate_fds) + if (!(bus->hello_flags & KDBUS_HELLO_ACCEPT_FD)) return 0; r = bus_ensure_running(bus); @@ -980,13 +1300,12 @@ int sd_bus_can_send(sd_bus *bus, char type) { return bus_type_is_valid(type); } -int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) { +_public_ int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) { int r; - if (!bus) - return -EINVAL; - if (!server_id) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(server_id, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); r = bus_ensure_running(bus); if (r < 0) @@ -996,16 +1315,55 @@ int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) { return 0; } -static int bus_seal_message(sd_bus *b, sd_bus_message *m) { +static int bus_seal_message(sd_bus *b, sd_bus_message *m, usec_t timeout) { + assert(b); assert(m); - if (m->header->version > b->message_version) + if (b->message_version != 0 && + m->header->version != b->message_version) + return -EPERM; + + if (b->message_endian != 0 && + m->header->endian != b->message_endian) return -EPERM; - if (m->sealed) + if (m->sealed) { + /* If we copy the same message to multiple + * destinations, avoid using the same serial + * numbers. */ + b->serial = MAX(b->serial, BUS_MESSAGE_SERIAL(m)); return 0; + } + + if (timeout == 0) + timeout = BUS_DEFAULT_TIMEOUT; + + return bus_message_seal(m, ++b->serial, timeout); +} + +int bus_seal_synthetic_message(sd_bus *b, sd_bus_message *m) { + assert(b); + assert(m); - return bus_message_seal(m, ++b->serial); + /* The bus specification says the serial number cannot be 0, + * hence let's fill something in for synthetic messages. Since + * synthetic messages might have a fake sender and we don't + * want to interfere with the real sender's serial numbers we + * pick a fixed, artifical one. We use (uint32_t) -1 rather + * than (uint64_t) -1 since dbus1 only had 32bit identifiers, + * even though kdbus can do 64bit. */ + + return bus_message_seal(m, 0xFFFFFFFFULL, 0); +} + +static int bus_write_message(sd_bus *bus, sd_bus_message *message, size_t *idx) { + assert(bus); + assert(message); + + if (bus->is_kernel) + return bus_kernel_write_message(bus, message); + else + return bus_socket_write_message(bus, message, idx); } static int dispatch_wqueue(sd_bus *bus) { @@ -1014,20 +1372,12 @@ static int dispatch_wqueue(sd_bus *bus) { assert(bus); assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - if (bus->output_fd < 0) - return -ENOTCONN; - while (bus->wqueue_size > 0) { - if (bus->is_kernel) - r = bus_kernel_write_message(bus, bus->wqueue[0]); - else - r = bus_socket_write_message(bus, bus->wqueue[0], &bus->windex); - - if (r < 0) { - sd_bus_close(bus); + r = bus_write_message(bus, bus->wqueue[0], &bus->windex); + if (r < 0) return r; - } else if (r == 0) + else if (r == 0) /* Didn't do anything this time */ return ret; else if (bus->is_kernel || bus->windex >= BUS_MESSAGE_SIZE(bus->wqueue[0])) { @@ -1053,58 +1403,62 @@ static int dispatch_wqueue(sd_bus *bus) { return ret; } +static int bus_read_message(sd_bus *bus) { + assert(bus); + + if (bus->is_kernel) + return bus_kernel_read_message(bus); + else + return bus_socket_read_message(bus); +} + +int bus_rqueue_make_room(sd_bus *bus) { + assert(bus); + + if (bus->rqueue_size >= BUS_RQUEUE_MAX) + return -ENOBUFS; + + if (!GREEDY_REALLOC(bus->rqueue, bus->rqueue_allocated, bus->rqueue_size + 1)) + return -ENOMEM; + + return 0; +} + static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) { - sd_bus_message *z = NULL; int r, ret = 0; assert(bus); assert(m); assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - if (bus->input_fd < 0) - return -ENOTCONN; - - if (bus->rqueue_size > 0) { - /* Dispatch a queued message */ - - *m = bus->rqueue[0]; - bus->rqueue_size --; - memmove(bus->rqueue, bus->rqueue + 1, sizeof(sd_bus_message*) * bus->rqueue_size); - return 1; - } + for (;;) { + if (bus->rqueue_size > 0) { + /* Dispatch a queued message */ - /* Try to read a new message */ - do { - if (bus->is_kernel) - r = bus_kernel_read_message(bus, &z); - else - r = bus_socket_read_message(bus, &z); + *m = bus->rqueue[0]; + bus->rqueue_size --; + memmove(bus->rqueue, bus->rqueue + 1, sizeof(sd_bus_message*) * bus->rqueue_size); + return 1; + } - if (r < 0) { - sd_bus_close(bus); + /* Try to read a new message */ + r = bus_read_message(bus); + if (r < 0) return r; - } if (r == 0) return ret; - r = 1; - } while (!z); - - *m = z; - return 1; + ret = 1; + } } -int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { +_public_ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { int r; - if (!bus) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->output_fd < 0) - return -ENOTCONN; - if (!m) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(m, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); if (m->n_fds > 0) { r = sd_bus_can_send(bus, SD_BUS_TYPE_UNIX_FD); @@ -1117,27 +1471,25 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { /* If the serial number isn't kept, then we know that no reply * is expected */ if (!serial && !m->sealed) - m->header->flags |= SD_BUS_MESSAGE_NO_REPLY_EXPECTED; + m->header->flags |= BUS_MESSAGE_NO_REPLY_EXPECTED; - r = bus_seal_message(bus, m); + r = bus_seal_message(bus, m, 0); if (r < 0) return r; /* If this is a reply and no reply was requested, then let's * suppress this, if we can */ if (m->dont_send && !serial) - return 0; + return 1; if ((bus->state == BUS_RUNNING || bus->state == BUS_HELLO) && bus->wqueue_size <= 0) { size_t idx = 0; - if (bus->is_kernel) - r = bus_kernel_write_message(bus, m); - else - r = bus_socket_write_message(bus, m, &idx); - + r = bus_write_message(bus, m, &idx); if (r < 0) { - sd_bus_close(bus); + if (r == -EPIPE || r == -ENOTCONN || r == -ESHUTDOWN) + bus_enter_closing(bus); + return r; } else if (!bus->is_kernel && idx < BUS_MESSAGE_SIZE(m)) { /* Wasn't fully written. So let's remember how @@ -1150,34 +1502,48 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { bus->windex = idx; } } else { - sd_bus_message **q; - /* Just append it to the queue. */ if (bus->wqueue_size >= BUS_WQUEUE_MAX) return -ENOBUFS; - q = realloc(bus->wqueue, sizeof(sd_bus_message*) * (bus->wqueue_size + 1)); - if (!q) + if (!GREEDY_REALLOC(bus->wqueue, bus->wqueue_allocated, bus->wqueue_size + 1)) return -ENOMEM; - bus->wqueue = q; - q[bus->wqueue_size ++] = sd_bus_message_ref(m); + bus->wqueue[bus->wqueue_size ++] = sd_bus_message_ref(m); } if (serial) *serial = BUS_MESSAGE_SERIAL(m); - return 0; + return 1; +} + +_public_ int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *serial) { + int r; + + assert_return(bus, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(m, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + if (!streq_ptr(m->destination, destination)) { + + if (!destination) + return -EEXIST; + + r = sd_bus_message_set_destination(m, destination); + if (r < 0) + return r; + } + + return sd_bus_send(bus, m, serial); } static usec_t calc_elapse(uint64_t usec) { if (usec == (uint64_t) -1) return 0; - if (usec == 0) - usec = BUS_DEFAULT_TIMEOUT; - return now(CLOCK_MONOTONIC) + usec; } @@ -1199,7 +1565,7 @@ static int timeout_compare(const void *a, const void *b) { return 0; } -int sd_bus_send_with_reply( +_public_ int sd_bus_call_async( sd_bus *bus, sd_bus_message *m, sd_bus_message_handler_t callback, @@ -1210,32 +1576,23 @@ int sd_bus_send_with_reply( struct reply_callback *c; int r; - if (!bus) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->output_fd < 0) - return -ENOTCONN; - if (!m) - return -EINVAL; - if (!callback) - return -EINVAL; - if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) - return -EINVAL; - if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(m, -EINVAL); + assert_return(m->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EINVAL); + assert_return(!(m->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED), -EINVAL); + assert_return(callback, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); r = hashmap_ensure_allocated(&bus->reply_callbacks, uint64_hash_func, uint64_compare_func); if (r < 0) return r; - if (usec != (uint64_t) -1) { - r = prioq_ensure_allocated(&bus->reply_callbacks_prioq, timeout_compare); - if (r < 0) - return r; - } + r = prioq_ensure_allocated(&bus->reply_callbacks_prioq, timeout_compare); + if (r < 0) + return r; - r = bus_seal_message(bus, m); + r = bus_seal_message(bus, m, usec); if (r < 0) return r; @@ -1246,7 +1603,7 @@ int sd_bus_send_with_reply( c->callback = callback; c->userdata = userdata; c->serial = BUS_MESSAGE_SERIAL(m); - c->timeout = calc_elapse(usec); + c->timeout = calc_elapse(m->timeout); r = hashmap_put(bus->reply_callbacks, &c->serial, c); if (r < 0) { @@ -1258,27 +1615,26 @@ int sd_bus_send_with_reply( r = prioq_put(bus->reply_callbacks_prioq, c, &c->prioq_idx); if (r < 0) { c->timeout = 0; - sd_bus_send_with_reply_cancel(bus, c->serial); + sd_bus_call_async_cancel(bus, c->serial); return r; } } r = sd_bus_send(bus, m, serial); if (r < 0) { - sd_bus_send_with_reply_cancel(bus, c->serial); + sd_bus_call_async_cancel(bus, c->serial); return r; } return r; } -int sd_bus_send_with_reply_cancel(sd_bus *bus, uint64_t serial) { +_public_ int sd_bus_call_async_cancel(sd_bus *bus, uint64_t serial) { struct reply_callback *c; - if (!bus) - return -EINVAL; - if (serial == 0) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(serial != 0, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); c = hashmap_remove(bus->reply_callbacks, &serial); if (!c) @@ -1296,11 +1652,8 @@ int bus_ensure_running(sd_bus *bus) { assert(bus); - if (bus->input_fd < 0) - return -ENOTCONN; - if (bus->state == BUS_UNSET) + if (bus->state == BUS_UNSET || bus->state == BUS_CLOSED || bus->state == BUS_CLOSING) return -ENOTCONN; - if (bus->state == BUS_RUNNING) return 1; @@ -1319,112 +1672,101 @@ int bus_ensure_running(sd_bus *bus) { } } -int sd_bus_send_with_reply_and_block( +_public_ int sd_bus_call( sd_bus *bus, sd_bus_message *m, uint64_t usec, sd_bus_error *error, sd_bus_message **reply) { - int r; usec_t timeout; uint64_t serial; - bool room = false; + unsigned i; + int r; - if (!bus) - return -EINVAL; - if (bus->output_fd < 0) - return -ENOTCONN; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (!m) - return -EINVAL; - if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) - return -EINVAL; - if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) - return -EINVAL; - if (bus_error_is_dirty(error)) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(m, -EINVAL); + assert_return(m->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EINVAL); + assert_return(!(m->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED), -EINVAL); + assert_return(!bus_error_is_dirty(error), -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); r = bus_ensure_running(bus); if (r < 0) return r; + i = bus->rqueue_size; + + r = bus_seal_message(bus, m, usec); + if (r < 0) + return r; + r = sd_bus_send(bus, m, &serial); if (r < 0) return r; - timeout = calc_elapse(usec); + timeout = calc_elapse(m->timeout); for (;;) { usec_t left; - sd_bus_message *incoming = NULL; - - if (!room) { - sd_bus_message **q; - - if (bus->rqueue_size >= BUS_RQUEUE_MAX) - return -ENOBUFS; - - /* Make sure there's room for queuing this - * locally, before we read the message */ - q = realloc(bus->rqueue, (bus->rqueue_size + 1) * sizeof(sd_bus_message*)); - if (!q) - return -ENOMEM; + while (i < bus->rqueue_size) { + sd_bus_message *incoming = NULL; - bus->rqueue = q; - room = true; - } - - if (bus->is_kernel) - r = bus_kernel_read_message(bus, &incoming); - else - r = bus_socket_read_message(bus, &incoming); - if (r < 0) - return r; - if (incoming) { + incoming = bus->rqueue[i]; if (incoming->reply_serial == serial) { /* Found a match! */ - if (incoming->header->type == SD_BUS_MESSAGE_TYPE_METHOD_RETURN) { + memmove(bus->rqueue + i, bus->rqueue + i + 1, sizeof(sd_bus_message*) * (bus->rqueue_size - i - 1)); + bus->rqueue_size--; + + if (incoming->header->type == SD_BUS_MESSAGE_METHOD_RETURN) { if (reply) *reply = incoming; else sd_bus_message_unref(incoming); - return 0; - } + return 1; + } else if (incoming->header->type == SD_BUS_MESSAGE_METHOD_ERROR) + r = sd_bus_error_copy(error, &incoming->error); + else + r = -EIO; - if (incoming->header->type == SD_BUS_MESSAGE_TYPE_METHOD_ERROR) { - int k; + sd_bus_message_unref(incoming); + return r; - r = sd_bus_error_copy(error, &incoming->error); - if (r < 0) { - sd_bus_message_unref(incoming); - return r; - } + } else if (incoming->header->serial == serial && + bus->unique_name && + incoming->sender && + streq(bus->unique_name, incoming->sender)) { - k = bus_error_to_errno(&incoming->error); - sd_bus_message_unref(incoming); - return k; - } + memmove(bus->rqueue + i, bus->rqueue + i + 1, sizeof(sd_bus_message*) * (bus->rqueue_size - i - 1)); + bus->rqueue_size--; + + /* Our own message? Somebody is trying + * to send its own client a message, + * let's not dead-lock, let's fail + * immediately. */ sd_bus_message_unref(incoming); - return -EIO; + return -ELOOP; } - /* There's already guaranteed to be room for - * this, so need to resize things here */ - bus->rqueue[bus->rqueue_size ++] = incoming; - room = false; - /* Try to read more, right-away */ - continue; + i++; } - if (r != 0) + + r = bus_read_message(bus); + if (r < 0) { + if (r == -EPIPE || r == -ENOTCONN || r == -ESHUTDOWN) + bus_enter_closing(bus); + + return r; + } + if (r > 0) continue; if (timeout > 0) { @@ -1441,33 +1783,34 @@ int sd_bus_send_with_reply_and_block( r = bus_poll(bus, true, left); if (r < 0) return r; + if (r == 0) + return -ETIMEDOUT; r = dispatch_wqueue(bus); - if (r < 0) + if (r < 0) { + if (r == -EPIPE || r == -ENOTCONN || r == -ESHUTDOWN) + bus_enter_closing(bus); + return r; + } } } -int sd_bus_get_fd(sd_bus *bus) { - if (!bus) - return -EINVAL; - if (bus->input_fd < 0) - return -ENOTCONN; - if (bus->input_fd != bus->output_fd) - return -EPERM; +_public_ int sd_bus_get_fd(sd_bus *bus) { + + assert_return(bus, -EINVAL); + assert_return(bus->input_fd == bus->output_fd, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); return bus->input_fd; } -int sd_bus_get_events(sd_bus *bus) { +_public_ int sd_bus_get_events(sd_bus *bus) { int flags = 0; - if (!bus) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->input_fd < 0) - return -ENOTCONN; + assert_return(bus, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state) || bus->state == BUS_CLOSING, -ENOTCONN); + assert_return(!bus_pid_changed(bus), -ECHILD); if (bus->state == BUS_OPENING) flags |= POLLOUT; @@ -1488,17 +1831,18 @@ int sd_bus_get_events(sd_bus *bus) { return flags; } -int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) { +_public_ int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) { struct reply_callback *c; - if (!bus) - return -EINVAL; - if (!timeout_usec) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->input_fd < 0) - return -ENOTCONN; + assert_return(bus, -EINVAL); + assert_return(timeout_usec, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state) || bus->state == BUS_CLOSING, -ENOTCONN); + assert_return(!bus_pid_changed(bus), -ECHILD); + + if (bus->state == BUS_CLOSING) { + *timeout_usec = 0; + return 1; + } if (bus->state == BUS_AUTHENTICATING) { *timeout_usec = bus->auth_timeout; @@ -1510,6 +1854,11 @@ int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) { return 0; } + if (bus->rqueue_size > 0) { + *timeout_usec = 0; + return 1; + } + c = prioq_peek(bus->reply_callbacks_prioq); if (!c) { *timeout_usec = (uint64_t) -1; @@ -1521,6 +1870,8 @@ int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) { } static int process_timeout(sd_bus *bus) { + _cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL; + _cleanup_bus_message_unref_ sd_bus_message* m = NULL; struct reply_callback *c; usec_t n; int r; @@ -1535,13 +1886,33 @@ static int process_timeout(sd_bus *bus) { if (c->timeout > n) return 0; + r = bus_message_new_synthetic_error( + bus, + c->serial, + &SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_NO_REPLY, "Method call timed out"), + &m); + if (r < 0) + return r; + + m->sender = "org.freedesktop.DBus"; + + r = bus_seal_synthetic_message(bus, m); + if (r < 0) + return r; + assert_se(prioq_pop(bus->reply_callbacks_prioq) == c); hashmap_remove(bus->reply_callbacks, &c->serial); - r = c->callback(bus, ETIMEDOUT, NULL, c->userdata); + bus->current = m; + bus->iteration_counter ++; + + r = c->callback(bus, m, c->userdata, &error_buffer); + r = bus_maybe_reply_error(m, r, &error_buffer); free(c); - return r < 0 ? r : 1; + bus->current = NULL; + + return r; } static int process_hello(sd_bus *bus, sd_bus_message *m) { @@ -1556,8 +1927,8 @@ static int process_hello(sd_bus *bus, sd_bus_message *m) { * here (we leave that to the usual handling), we just verify * we don't let any earlier msg through. */ - if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_RETURN && - m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_ERROR) + if (m->header->type != SD_BUS_MESSAGE_METHOD_RETURN && + m->header->type != SD_BUS_MESSAGE_METHOD_ERROR) return -EIO; if (m->reply_serial != bus->hello_serial) @@ -1567,14 +1938,15 @@ static int process_hello(sd_bus *bus, sd_bus_message *m) { } static int process_reply(sd_bus *bus, sd_bus_message *m) { + _cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL; struct reply_callback *c; int r; assert(bus); assert(m); - if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_RETURN && - m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_ERROR) + if (m->header->type != SD_BUS_MESSAGE_METHOD_RETURN && + m->header->type != SD_BUS_MESSAGE_METHOD_ERROR) return 0; c = hashmap_remove(bus->reply_callbacks, &m->reply_serial); @@ -1584,13 +1956,19 @@ static int process_reply(sd_bus *bus, sd_bus_message *m) { if (c->timeout != 0) prioq_remove(bus->reply_callbacks_prioq, c, &c->prioq_idx); - r = c->callback(bus, 0, m, c->userdata); + r = sd_bus_message_rewind(m, true); + if (r < 0) + return r; + + r = c->callback(bus, m, c->userdata, &error_buffer); + r = bus_maybe_reply_error(m, r, &error_buffer); free(c); return r; } static int process_filter(sd_bus *bus, sd_bus_message *m) { + _cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL; struct filter_callback *l; int r; @@ -1611,7 +1989,12 @@ static int process_filter(sd_bus *bus, sd_bus_message *m) { l->last_iteration = bus->iteration_counter; - r = l->callback(bus, 0, m, l->userdata); + r = sd_bus_message_rewind(m, true); + if (r < 0) + return r; + + r = l->callback(bus, m, l->userdata, &error_buffer); + r = bus_maybe_reply_error(m, r, &error_buffer); if (r != 0) return r; @@ -1631,7 +2014,7 @@ static int process_match(sd_bus *bus, sd_bus_message *m) { do { bus->match_callbacks_modified = false; - r = bus_match_run(bus, &bus->match_callbacks, 0, m); + r = bus_match_run(bus, &bus->match_callbacks, m); if (r != 0) return r; @@ -1647,17 +2030,17 @@ static int process_builtin(sd_bus *bus, sd_bus_message *m) { assert(bus); assert(m); - if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) + if (m->header->type != SD_BUS_MESSAGE_METHOD_CALL) return 0; if (!streq_ptr(m->interface, "org.freedesktop.DBus.Peer")) return 0; - if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) + if (m->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED) return 1; if (streq_ptr(m->member, "Ping")) - r = sd_bus_message_new_method_return(bus, m, &reply); + r = sd_bus_message_new_method_return(m, &reply); else if (streq_ptr(m->member, "GetMachineId")) { sd_id128_t id; char sid[33]; @@ -1666,19 +2049,16 @@ static int process_builtin(sd_bus *bus, sd_bus_message *m) { if (r < 0) return r; - r = sd_bus_message_new_method_return(bus, m, &reply); + r = sd_bus_message_new_method_return(m, &reply); if (r < 0) return r; r = sd_bus_message_append(reply, "s", sd_id128_to_string(id, sid)); } else { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - - sd_bus_error_set(&error, - "org.freedesktop.DBus.Error.UnknownMethod", + r = sd_bus_message_new_method_errorf( + m, &reply, + SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method '%s' on interface '%s'.", m->member, m->interface); - - r = sd_bus_message_new_method_error(bus, m, &error, &reply); } if (r < 0) @@ -1691,217 +2071,46 @@ static int process_builtin(sd_bus *bus, sd_bus_message *m) { return 1; } -static int process_object(sd_bus *bus, sd_bus_message *m) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - struct object_callback *c; +static int process_message(sd_bus *bus, sd_bus_message *m) { int r; - bool found = false; - size_t pl; assert(bus); assert(m); - if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) - return 0; + bus->current = m; + bus->iteration_counter++; - if (hashmap_isempty(bus->object_callbacks)) - return 0; - - pl = strlen(m->path); - - do { - char p[pl+1]; - - bus->object_callbacks_modified = false; - - c = hashmap_get(bus->object_callbacks, m->path); - if (c && c->last_iteration != bus->iteration_counter) { - - c->last_iteration = bus->iteration_counter; - - r = c->callback(bus, 0, m, c->userdata); - if (r != 0) - return r; - - found = true; - } - - /* Look for fallback prefixes */ - strcpy(p, m->path); - for (;;) { - char *e; - - if (bus->object_callbacks_modified) - break; - - e = strrchr(p, '/'); - if (e == p || !e) - break; - - *e = 0; - - c = hashmap_get(bus->object_callbacks, p); - if (c && c->last_iteration != bus->iteration_counter && c->is_fallback) { - - c->last_iteration = bus->iteration_counter; - - r = c->callback(bus, 0, m, c->userdata); - if (r != 0) - return r; - - found = true; - } - } - - } while (bus->object_callbacks_modified); - - /* We found some handlers but none wanted to take this, then - * return this -- with one exception, we can handle - * introspection minimally ourselves */ - if (!found || sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) - return 0; - - sd_bus_error_set(&error, - "org.freedesktop.DBus.Error.UnknownMethod", - "Unknown method '%s' or interface '%s'.", m->member, m->interface); - - r = sd_bus_message_new_method_error(bus, m, &error, &reply); - if (r < 0) - return r; - - r = sd_bus_send(bus, reply, NULL); - if (r < 0) - return r; - - return 1; -} - -static int process_introspect(sd_bus *bus, sd_bus_message *m) { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - _cleanup_free_ char *introspection = NULL; - _cleanup_set_free_free_ Set *s = NULL; - _cleanup_fclose_ FILE *f = NULL; - struct object_callback *c; - Iterator i; - size_t size = 0; - char *node; - int r; - - assert(bus); - assert(m); - - if (!sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) - return 0; - - if (!m->path) - return 0; - - s = set_new(string_hash_func, string_compare_func); - if (!s) - return -ENOMEM; - - HASHMAP_FOREACH(c, bus->object_callbacks, i) { - const char *e; - char *a, *p; - - if (streq(c->path, "/")) - continue; - - if (streq(m->path, "/")) - e = c->path; - else { - e = startswith(c->path, m->path); - if (!e || *e != '/') - continue; - } - - a = strdup(e+1); - if (!a) - return -ENOMEM; - - p = strchr(a, '/'); - if (p) - *p = 0; - - r = set_put(s, a); - if (r < 0) { - free(a); - - if (r != -EEXIST) - return r; - } - } - - f = open_memstream(&introspection, &size); - if (!f) - return -ENOMEM; - - fputs(SD_BUS_INTROSPECT_DOCTYPE, f); - fputs("\n", f); - fputs(SD_BUS_INTROSPECT_INTERFACE_PEER, f); - fputs(SD_BUS_INTROSPECT_INTERFACE_INTROSPECTABLE, f); - - while ((node = set_steal_first(s))) { - fprintf(f, " \n", node); - free(node); - } - - fputs("\n", f); - - fflush(f); - - if (ferror(f)) - return -ENOMEM; - - r = sd_bus_message_new_method_return(bus, m, &reply); - if (r < 0) - return r; - - r = sd_bus_message_append(reply, "s", introspection); - if (r < 0) - return r; - - r = sd_bus_send(bus, reply, NULL); - if (r < 0) - return r; - - return 1; -} - -static int process_message(sd_bus *bus, sd_bus_message *m) { - int r; - - assert(bus); - assert(m); - - bus->iteration_counter++; + log_debug("Got message sender=%s object=%s interface=%s member=%s", + strna(sd_bus_message_get_sender(m)), + strna(sd_bus_message_get_path(m)), + strna(sd_bus_message_get_interface(m)), + strna(sd_bus_message_get_member(m))); r = process_hello(bus, m); if (r != 0) - return r; + goto finish; r = process_reply(bus, m); if (r != 0) - return r; + goto finish; r = process_filter(bus, m); if (r != 0) - return r; + goto finish; r = process_match(bus, m); if (r != 0) - return r; + goto finish; r = process_builtin(bus, m); if (r != 0) - return r; + goto finish; - r = process_object(bus, m); - if (r != 0) - return r; + r = bus_process_object(bus, m); - return process_introspect(bus, m); +finish: + bus->current = NULL; + return r; } static int process_running(sd_bus *bus, sd_bus_message **ret) { @@ -1930,22 +2139,21 @@ static int process_running(sd_bus *bus, sd_bus_message **ret) { goto null_message; if (ret) { + r = sd_bus_message_rewind(m, true); + if (r < 0) + return r; + *ret = m; m = NULL; return 1; } - if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL) { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL) { - sd_bus_error_set(&error, "org.freedesktop.DBus.Error.UnknownObject", "Unknown object '%s'.", m->path); - - r = sd_bus_message_new_method_error(bus, m, &error, &reply); - if (r < 0) - return r; - - r = sd_bus_send(bus, reply, NULL); + r = sd_bus_reply_method_errorf( + m, + SD_BUS_ERROR_UNKNOWN_OBJECT, + "Unknown object '%s'.", m->path); if (r < 0) return r; } @@ -1959,7 +2167,89 @@ null_message: return r; } -int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { +static int process_closing(sd_bus *bus, sd_bus_message **ret) { + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + struct reply_callback *c; + int r; + + assert(bus); + assert(bus->state == BUS_CLOSING); + + c = hashmap_first(bus->reply_callbacks); + if (c) { + _cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL; + + /* First, fail all outstanding method calls */ + r = bus_message_new_synthetic_error( + bus, + c->serial, + &SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_NO_REPLY, "Connection terminated"), + &m); + if (r < 0) + return r; + + r = bus_seal_synthetic_message(bus, m); + if (r < 0) + return r; + + if (c->timeout != 0) + prioq_remove(bus->reply_callbacks_prioq, c, &c->prioq_idx); + + hashmap_remove(bus->reply_callbacks, &c->serial); + + bus->current = m; + bus->iteration_counter++; + + r = c->callback(bus, m, c->userdata, &error_buffer); + r = bus_maybe_reply_error(m, r, &error_buffer); + free(c); + + goto finish; + } + + /* Then, synthesize a Disconnected message */ + r = sd_bus_message_new_signal( + bus, + "/org/freedesktop/DBus/Local", + "org.freedesktop.DBus.Local", + "Disconnected", + &m); + if (r < 0) + return r; + + m->sender = "org.freedesktop.DBus.Local"; + + r = bus_seal_synthetic_message(bus, m); + if (r < 0) + return r; + + sd_bus_close(bus); + + bus->current = m; + bus->iteration_counter++; + + r = process_filter(bus, m); + if (r != 0) + goto finish; + + r = process_match(bus, m); + if (r != 0) + goto finish; + + if (ret) { + *ret = m; + m = NULL; + } + + r = 1; + +finish: + bus->current = NULL; + return r; +} + +_public_ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { + BUS_DONT_DESTROY(bus); int r; /* Returns 0 when we didn't do anything. This should cause the @@ -1967,45 +2257,59 @@ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { * time. Returns > 0 when we did something, which possibly * means *ret is filled in with an unprocessed message. */ - if (!bus) - return -EINVAL; - if (bus->input_fd < 0) - return -ENOTCONN; + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); /* We don't allow recursively invoking sd_bus_process(). */ - if (bus->processing) - return -EBUSY; + assert_return(!bus->current, -EBUSY); switch (bus->state) { case BUS_UNSET: return -ENOTCONN; + case BUS_CLOSED: + return -ECONNRESET; + case BUS_OPENING: r = bus_socket_process_opening(bus); - if (r < 0) + if (r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN) { + bus_enter_closing(bus); + r = 1; + } else if (r < 0) return r; if (ret) *ret = NULL; return r; case BUS_AUTHENTICATING: - r = bus_socket_process_authenticating(bus); - if (r < 0) + if (r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN) { + bus_enter_closing(bus); + r = 1; + } else if (r < 0) return r; + if (ret) *ret = NULL; + return r; case BUS_RUNNING: case BUS_HELLO: - - bus->processing = true; r = process_running(bus, ret); - bus->processing = false; + if (r == -ECONNRESET || r == -EPIPE || r == -ESHUTDOWN) { + bus_enter_closing(bus); + r = 1; + + if (ret) + *ret = NULL; + } return r; + + case BUS_CLOSING: + return process_closing(bus, ret); } assert_not_reached("Unknown state"); @@ -2015,29 +2319,37 @@ static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) { struct pollfd p[2] = {}; int r, e, n; struct timespec ts; - usec_t until, m; + usec_t m = (usec_t) -1; assert(bus); - if (bus->input_fd < 0) - return -ENOTCONN; + if (bus->state == BUS_CLOSING) + return 1; + + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); e = sd_bus_get_events(bus); if (e < 0) return e; if (need_more) + /* The caller really needs some more data, he doesn't + * care about what's already read, or any timeouts + * except its own.*/ e |= POLLIN; - - r = sd_bus_get_timeout(bus, &until); - if (r < 0) - return r; - if (r == 0) - m = (uint64_t) -1; else { - usec_t nw; - nw = now(CLOCK_MONOTONIC); - m = until > nw ? until - nw : 0; + usec_t until; + /* The caller wants to process if there's something to + * process, but doesn't care otherwise */ + + r = sd_bus_get_timeout(bus, &until); + if (r < 0) + return r; + if (r > 0) { + usec_t nw; + nw = now(CLOCK_MONOTONIC); + m = until > nw ? until - nw : 0; + } } if (timeout_usec != (uint64_t) -1 && (m == (uint64_t) -1 || timeout_usec < m)) @@ -2061,29 +2373,32 @@ static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) { return r > 0 ? 1 : 0; } -int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) { +_public_ int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) { + + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + if (bus->state == BUS_CLOSING) + return 0; + + assert_return(BUS_IS_OPEN(bus->state) , -ENOTCONN); - if (!bus) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->input_fd < 0) - return -ENOTCONN; if (bus->rqueue_size > 0) return 0; return bus_poll(bus, false, timeout_usec); } -int sd_bus_flush(sd_bus *bus) { +_public_ int sd_bus_flush(sd_bus *bus) { int r; - if (!bus) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->output_fd < 0) - return -ENOTCONN; + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + if (bus->state == BUS_CLOSING) + return 0; + + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); r = bus_ensure_running(bus); if (r < 0) @@ -2094,8 +2409,12 @@ int sd_bus_flush(sd_bus *bus) { for (;;) { r = dispatch_wqueue(bus); - if (r < 0) + if (r < 0) { + if (r == -EPIPE || r == -ENOTCONN || r == -ESHUTDOWN) + bus_enter_closing(bus); + return r; + } if (bus->wqueue_size <= 0) return 0; @@ -2106,13 +2425,15 @@ int sd_bus_flush(sd_bus *bus) { } } -int sd_bus_add_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata) { +_public_ int sd_bus_add_filter(sd_bus *bus, + sd_bus_message_handler_t callback, + void *userdata) { + struct filter_callback *f; - if (!bus) - return -EINVAL; - if (!callback) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(callback, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); f = new0(struct filter_callback, 1); if (!f) @@ -2121,22 +2442,24 @@ int sd_bus_add_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *user f->userdata = userdata; bus->filter_callbacks_modified = true; - LIST_PREPEND(struct filter_callback, callbacks, bus->filter_callbacks, f); + LIST_PREPEND(callbacks, bus->filter_callbacks, f); return 0; } -int sd_bus_remove_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata) { +_public_ int sd_bus_remove_filter(sd_bus *bus, + sd_bus_message_handler_t callback, + void *userdata) { + struct filter_callback *f; - if (!bus) - return -EINVAL; - if (!callback) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(callback, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); LIST_FOREACH(callbacks, f, bus->filter_callbacks) { if (f->callback == callback && f->userdata == userdata) { bus->filter_callbacks_modified = true; - LIST_REMOVE(struct filter_callback, callbacks, bus->filter_callbacks, f); + LIST_REMOVE(callbacks, bus->filter_callbacks, f); free(f); return 1; } @@ -2145,264 +2468,470 @@ int sd_bus_remove_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *u return 0; } -static int bus_add_object( - sd_bus *bus, - bool fallback, - const char *path, - sd_bus_message_handler_t callback, - void *userdata) { +_public_ int sd_bus_add_match(sd_bus *bus, + const char *match, + sd_bus_message_handler_t callback, + void *userdata) { - struct object_callback *c; - int r; + struct bus_match_component *components = NULL; + unsigned n_components = 0; + uint64_t cookie = 0; + int r = 0; - if (!bus) - return -EINVAL; - if (!path) - return -EINVAL; - if (!callback) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(match, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); - r = hashmap_ensure_allocated(&bus->object_callbacks, string_hash_func, string_compare_func); + r = bus_match_parse(match, &components, &n_components); if (r < 0) - return r; + goto finish; - c = new0(struct object_callback, 1); - if (!c) - return -ENOMEM; + if (bus->bus_client) { + cookie = ++bus->match_cookie; - c->path = strdup(path); - if (!c->path) { - free(c); - return -ENOMEM; + r = bus_add_match_internal(bus, match, components, n_components, cookie); + if (r < 0) + goto finish; } - c->callback = callback; - c->userdata = userdata; - c->is_fallback = fallback; - - bus->object_callbacks_modified = true; - r = hashmap_put(bus->object_callbacks, c->path, c); + bus->match_callbacks_modified = true; + r = bus_match_add(&bus->match_callbacks, components, n_components, callback, userdata, cookie, NULL); if (r < 0) { - free(c->path); - free(c); - return r; + if (bus->bus_client) + bus_remove_match_internal(bus, match, cookie); } - return 0; +finish: + bus_match_parse_free(components, n_components); + return r; } -static int bus_remove_object( - sd_bus *bus, - bool fallback, - const char *path, - sd_bus_message_handler_t callback, - void *userdata) { +_public_ int sd_bus_remove_match(sd_bus *bus, + const char *match, + sd_bus_message_handler_t callback, + void *userdata) { - struct object_callback *c; + struct bus_match_component *components = NULL; + unsigned n_components = 0; + int r = 0, q = 0; + uint64_t cookie = 0; - if (!bus) - return -EINVAL; - if (!path) - return -EINVAL; - if (!callback) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(match, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); - c = hashmap_get(bus->object_callbacks, path); - if (!c) - return 0; + r = bus_match_parse(match, &components, &n_components); + if (r < 0) + return r; - if (c->callback != callback || c->userdata != userdata || c->is_fallback != fallback) - return 0; + bus->match_callbacks_modified = true; + r = bus_match_remove(&bus->match_callbacks, components, n_components, callback, userdata, &cookie); - bus->object_callbacks_modified = true; - assert_se(c == hashmap_remove(bus->object_callbacks, c->path)); + if (bus->bus_client) + q = bus_remove_match_internal(bus, match, cookie); - free(c->path); - free(c); + bus_match_parse_free(components, n_components); - return 1; + return r < 0 ? r : q; } -int sd_bus_add_object(sd_bus *bus, const char *path, sd_bus_message_handler_t callback, void *userdata) { - return bus_add_object(bus, false, path, callback, userdata); -} +bool bus_pid_changed(sd_bus *bus) { + assert(bus); + + /* We don't support people creating a bus connection and + * keeping it around over a fork(). Let's complain. */ -int sd_bus_remove_object(sd_bus *bus, const char *path, sd_bus_message_handler_t callback, void *userdata) { - return bus_remove_object(bus, false, path, callback, userdata); + return bus->original_pid != getpid(); } -int sd_bus_add_fallback(sd_bus *bus, const char *prefix, sd_bus_message_handler_t callback, void *userdata) { - return bus_add_object(bus, true, prefix, callback, userdata); +static int io_callback(sd_event_source *s, int fd, uint32_t revents, void *userdata) { + sd_bus *bus = userdata; + int r; + + assert(bus); + + r = sd_bus_process(bus, NULL); + if (r < 0) + return r; + + return 1; } -int sd_bus_remove_fallback(sd_bus *bus, const char *prefix, sd_bus_message_handler_t callback, void *userdata) { - return bus_remove_object(bus, true, prefix, callback, userdata); +static int time_callback(sd_event_source *s, uint64_t usec, void *userdata) { + sd_bus *bus = userdata; + int r; + + assert(bus); + + r = sd_bus_process(bus, NULL); + if (r < 0) + return r; + + return 1; } -int sd_bus_add_match(sd_bus *bus, const char *match, sd_bus_message_handler_t callback, void *userdata) { - int r = 0; +static int prepare_callback(sd_event_source *s, void *userdata) { + sd_bus *bus = userdata; + int r, e; + usec_t until; - if (!bus) - return -EINVAL; - if (!match) - return -EINVAL; + assert(s); + assert(bus); - if (bus->bus_client) { - r = bus_add_match_internal(bus, match); + e = sd_bus_get_events(bus); + if (e < 0) + return e; + + if (bus->output_fd != bus->input_fd) { + + r = sd_event_source_set_io_events(bus->input_io_event_source, e & POLLIN); + if (r < 0) + return r; + + r = sd_event_source_set_io_events(bus->output_io_event_source, e & POLLOUT); + if (r < 0) + return r; + } else { + r = sd_event_source_set_io_events(bus->input_io_event_source, e); if (r < 0) return r; } - if (callback) { - bus->match_callbacks_modified = true; - r = bus_match_add(&bus->match_callbacks, match, callback, userdata, NULL); - if (r < 0) { + r = sd_bus_get_timeout(bus, &until); + if (r < 0) + return r; + if (r > 0) { + int j; - if (bus->bus_client) - bus_remove_match_internal(bus, match); - } + j = sd_event_source_set_time(bus->time_event_source, until); + if (j < 0) + return j; } - return r; + r = sd_event_source_set_enabled(bus->time_event_source, r > 0); + if (r < 0) + return r; + + return 1; } -int sd_bus_remove_match(sd_bus *bus, const char *match, sd_bus_message_handler_t callback, void *userdata) { - int r = 0, q = 0; +static int quit_callback(sd_event_source *event, void *userdata) { + sd_bus *bus = userdata; - if (!bus) - return -EINVAL; - if (!match) - return -EINVAL; + assert(event); - if (bus->bus_client) - r = bus_remove_match_internal(bus, match); + sd_bus_flush(bus); - if (callback) { - bus->match_callbacks_modified = true; - q = bus_match_remove(&bus->match_callbacks, match, callback, userdata); - } + return 1; +} + +static int attach_io_events(sd_bus *bus) { + int r; + + assert(bus); + + if (bus->input_fd < 0) + return 0; + + if (!bus->event) + return 0; + + if (!bus->input_io_event_source) { + r = sd_event_add_io(bus->event, bus->input_fd, 0, io_callback, bus, &bus->input_io_event_source); + if (r < 0) + return r; + + r = sd_event_source_set_prepare(bus->input_io_event_source, prepare_callback); + if (r < 0) + return r; + + r = sd_event_source_set_priority(bus->input_io_event_source, bus->event_priority); + } else + r = sd_event_source_set_io_fd(bus->input_io_event_source, bus->input_fd); if (r < 0) return r; - return q; + + if (bus->output_fd != bus->input_fd) { + assert(bus->output_fd >= 0); + + if (!bus->output_io_event_source) { + r = sd_event_add_io(bus->event, bus->output_fd, 0, io_callback, bus, &bus->output_io_event_source); + if (r < 0) + return r; + + r = sd_event_source_set_priority(bus->output_io_event_source, bus->event_priority); + } else + r = sd_event_source_set_io_fd(bus->output_io_event_source, bus->output_fd); + + if (r < 0) + return r; + } + + return 0; } -int sd_bus_emit_signal( - sd_bus *bus, - const char *path, - const char *interface, - const char *member, - const char *types, ...) { +static void detach_io_events(sd_bus *bus) { + assert(bus); - _cleanup_bus_message_unref_ sd_bus_message *m = NULL; - va_list ap; + if (bus->input_io_event_source) { + sd_event_source_set_enabled(bus->input_io_event_source, SD_EVENT_OFF); + bus->input_io_event_source = sd_event_source_unref(bus->input_io_event_source); + } + + if (bus->output_io_event_source) { + sd_event_source_set_enabled(bus->output_io_event_source, SD_EVENT_OFF); + bus->output_io_event_source = sd_event_source_unref(bus->output_io_event_source); + } +} + +_public_ int sd_bus_attach_event(sd_bus *bus, sd_event *event, int priority) { int r; - if (!bus) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(!bus->event, -EBUSY); + + assert(!bus->input_io_event_source); + assert(!bus->output_io_event_source); + assert(!bus->time_event_source); - r = sd_bus_message_new_signal(bus, path, interface, member, &m); + if (event) + bus->event = sd_event_ref(event); + else { + r = sd_event_default(&bus->event); + if (r < 0) + return r; + } + + bus->event_priority = priority; + + r = sd_event_add_monotonic(bus->event, 0, 0, time_callback, bus, &bus->time_event_source); if (r < 0) - return r; + goto fail; - va_start(ap, types); - r = bus_message_append_ap(m, types, ap); - va_end(ap); + r = sd_event_source_set_priority(bus->time_event_source, priority); if (r < 0) - return r; + goto fail; - return sd_bus_send(bus, m, NULL); + r = sd_event_add_exit(bus->event, quit_callback, bus, &bus->quit_event_source); + if (r < 0) + goto fail; + + r = attach_io_events(bus); + if (r < 0) + goto fail; + + return 0; + +fail: + sd_bus_detach_event(bus); + return r; } -int sd_bus_call_method( - sd_bus *bus, - const char *destination, - const char *path, - const char *interface, - const char *member, - sd_bus_error *error, - sd_bus_message **reply, - const char *types, ...) { +_public_ int sd_bus_detach_event(sd_bus *bus) { + assert_return(bus, -EINVAL); - _cleanup_bus_message_unref_ sd_bus_message *m = NULL; - va_list ap; - int r; + if (!bus->event) + return 0; - if (!bus) - return -EINVAL; + detach_io_events(bus); - r = sd_bus_message_new_method_call(bus, destination, path, interface, member, &m); - if (r < 0) - return r; + if (bus->time_event_source) { + sd_event_source_set_enabled(bus->time_event_source, SD_EVENT_OFF); + bus->time_event_source = sd_event_source_unref(bus->time_event_source); + } - va_start(ap, types); - r = bus_message_append_ap(m, types, ap); - va_end(ap); - if (r < 0) - return r; + if (bus->quit_event_source) { + sd_event_source_set_enabled(bus->quit_event_source, SD_EVENT_OFF); + bus->quit_event_source = sd_event_source_unref(bus->quit_event_source); + } - return sd_bus_send_with_reply_and_block(bus, m, 0, error, reply); + if (bus->event) + bus->event = sd_event_unref(bus->event); + + return 1; } -int sd_bus_reply_method_return( - sd_bus *bus, - sd_bus_message *call, - const char *types, ...) { +_public_ sd_event* sd_bus_get_event(sd_bus *bus) { + assert_return(bus, NULL); - _cleanup_bus_message_unref_ sd_bus_message *m = NULL; - va_list ap; + return bus->event; +} + +_public_ sd_bus_message* sd_bus_get_current(sd_bus *bus) { + assert_return(bus, NULL); + + return bus->current; +} + +static int bus_default(int (*bus_open)(sd_bus **), sd_bus **default_bus, sd_bus **ret) { + sd_bus *b = NULL; int r; - if (!bus) - return -EINVAL; - if (!call) - return -EINVAL; - if (!call->sealed) - return -EPERM; - if (call->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) - return -EINVAL; + assert(bus_open); + assert(default_bus); - if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) + if (!ret) + return !!*default_bus; + + if (*default_bus) { + *ret = sd_bus_ref(*default_bus); return 0; + } - r = sd_bus_message_new_method_return(bus, call, &m); + r = bus_open(&b); if (r < 0) return r; - va_start(ap, types); - r = bus_message_append_ap(m, types, ap); - va_end(ap); - if (r < 0) - return r; + b->default_bus_ptr = default_bus; + b->tid = gettid(); + *default_bus = b; - return sd_bus_send(bus, m, NULL); + *ret = b; + return 1; } -int sd_bus_reply_method_error( - sd_bus *bus, - sd_bus_message *call, - const sd_bus_error *e) { +_public_ int sd_bus_default_system(sd_bus **ret) { + static __thread sd_bus *default_system_bus = NULL; - _cleanup_bus_message_unref_ sd_bus_message *m = NULL; - int r; + return bus_default(sd_bus_open_system, &default_system_bus, ret); +} - if (!bus) - return -EINVAL; - if (!call) - return -EINVAL; - if (!call->sealed) - return -EPERM; - if (call->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) - return -EINVAL; - if (!sd_bus_error_is_set(e)) - return -EINVAL; +_public_ int sd_bus_default_user(sd_bus **ret) { + static __thread sd_bus *default_user_bus = NULL; + + return bus_default(sd_bus_open_user, &default_user_bus, ret); +} - if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) +_public_ int sd_bus_get_tid(sd_bus *b, pid_t *tid) { + assert_return(b, -EINVAL); + assert_return(tid, -EINVAL); + assert_return(!bus_pid_changed(b), -ECHILD); + + if (b->tid != 0) { + *tid = b->tid; return 0; + } - r = sd_bus_message_new_method_error(bus, call, e, &m); + if (b->event) + return sd_event_get_tid(b->event, tid); + + return -ENXIO; +} + +_public_ char *sd_bus_label_escape(const char *s) { + char *r, *t; + const char *f; + + assert_return(s, NULL); + + /* Escapes all chars that D-Bus' object path cannot deal + * with. Can be reversed with bus_path_unescape(). We special + * case the empty string. */ + + if (*s == 0) + return strdup("_"); + + r = new(char, strlen(s)*3 + 1); + if (!r) + return NULL; + + for (f = s, t = r; *f; f++) { + + /* Escape everything that is not a-zA-Z0-9. We also + * escape 0-9 if it's the first character */ + + if (!(*f >= 'A' && *f <= 'Z') && + !(*f >= 'a' && *f <= 'z') && + !(f > s && *f >= '0' && *f <= '9')) { + *(t++) = '_'; + *(t++) = hexchar(*f >> 4); + *(t++) = hexchar(*f); + } else + *(t++) = *f; + } + + *t = 0; + + return r; +} + +_public_ char *sd_bus_label_unescape(const char *f) { + char *r, *t; + + assert_return(f, NULL); + + /* Special case for the empty string */ + if (streq(f, "_")) + return strdup(""); + + r = new(char, strlen(f) + 1); + if (!r) + return NULL; + + for (t = r; *f; f++) { + + if (*f == '_') { + int a, b; + + if ((a = unhexchar(f[1])) < 0 || + (b = unhexchar(f[2])) < 0) { + /* Invalid escape code, let's take it literal then */ + *(t++) = '_'; + } else { + *(t++) = (char) ((a << 4) | b); + f += 2; + } + } else + *(t++) = *f; + } + + *t = 0; + + return r; +} + +_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_IS_OPEN(bus->state), -ENOTCONN); + assert_return(!bus_pid_changed(bus), -ECHILD); + assert_return(!bus->is_kernel, -ENOTSUP); + + 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; - return sd_bus_send(bus, m, NULL); + *ret = c; + return 0; }