X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fsd-bus.c;h=f13e346dcfb105f0830e60e957b94e838b467bde;hp=c5cbb5682d8cc370dac7f55d08b56c7ba1fc68fd;hb=c99c09a2dc0f72e6f10449c9e110158612a43ab6;hpb=fbfa72b0a1276366d50dce223c06efe9db9d6585 diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index c5cbb5682..f13e346dc 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -26,79 +26,383 @@ #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" #include "bus-message.h" #include "bus-type.h" +#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" + +static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec); + +static void bus_close_fds(sd_bus *b) { + assert(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); + } -#define WQUEUE_MAX 128 + 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_size = b->wqueue_size = 0; +} static void bus_free(sd_bus *b) { struct filter_callback *f; + struct node *n; assert(b); - if (b->fd >= 0) - close_nointr_nofail(b->fd); + 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->rqueue); - free(b->wqueue); 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); + + close_many(b->fds, b->n_fds); + free(b->fds); + + 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); } + bus_match_free(&b->match_callbacks); + + hashmap_free_free(b->vtable_methods); + hashmap_free_free(b->vtable_properties); + + 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); } -static sd_bus* bus_new(void) { +_public_ int sd_bus_new(sd_bus **ret) { sd_bus *r; + assert_return(ret, -EINVAL); + r = new0(sd_bus, 1); if (!r) - return NULL; + return -ENOMEM; - r->n_ref = 1; - r->fd = -1; + r->n_ref = REFCNT_INIT; + r->input_fd = r->output_fd = -1; r->message_version = 1; + r->hello_flags |= KDBUS_HELLO_ACCEPT_FD; + 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) { free(r); - return NULL; + return -ENOMEM; } - return r; -}; + *ret = r; + return 0; +} + +_public_ int sd_bus_set_address(sd_bus *bus, const char *address) { + char *a; + + 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) + return -ENOMEM; + + free(bus->address); + bus->address = a; + + return 0; +} + +_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; +} + +_public_ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) { + char *p, **a; + + 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) + return -ENOMEM; + + a = strv_copy(argv); + if (!a) { + free(p); + return -ENOMEM; + } + + free(bus->exec_path); + strv_free(bus->exec_argv); + + bus->exec_path = p; + bus->exec_argv = a; + + return 0; +} + +_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; +} + +_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); + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ACCEPT_FD, b); + return 0; +} + +_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->hello_flags, KDBUS_HELLO_ATTACH_TIMESTAMP, b); + return 0; +} + +_public_ int sd_bus_negotiate_attach_creds(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->hello_flags, KDBUS_HELLO_ATTACH_CREDS, b); + return 0; +} + +_public_ int sd_bus_negotiate_attach_comm(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->hello_flags, KDBUS_HELLO_ATTACH_COMM, b); + return 0; +} + +_public_ int sd_bus_negotiate_attach_exe(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->hello_flags, KDBUS_HELLO_ATTACH_EXE, b); + return 0; +} + +_public_ int sd_bus_negotiate_attach_cmdline(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->hello_flags, KDBUS_HELLO_ATTACH_CMDLINE, b); + return 0; +} + +_public_ int sd_bus_negotiate_attach_cgroup(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->hello_flags, KDBUS_HELLO_ATTACH_CGROUP, b); + return 0; +} + +_public_ int sd_bus_negotiate_attach_caps(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->hello_flags, KDBUS_HELLO_ATTACH_CAPS, b); + return 0; +} + +_public_ int sd_bus_negotiate_attach_selinux_context(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->hello_flags, KDBUS_HELLO_ATTACH_SECLABEL, b); + return 0; +} + +_public_ int sd_bus_negotiate_attach_audit(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->hello_flags, KDBUS_HELLO_ATTACH_AUDIT, b); + return 0; +} + +_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; +} + +_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, sd_bus_message *reply, void *userdata) { +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 || bus->state == BUS_CLOSING); assert(reply); - bus->state = BUS_RUNNING; + 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; + if (!service_name_is_valid(s) || s[0] != ':') + return -EBADMSG; + bus->unique_name = strdup(s); if (!bus->unique_name) return -ENOMEM; + if (bus->state == BUS_HELLO) + bus->state = BUS_RUNNING; + return 1; } @@ -108,6 +412,9 @@ static int bus_send_hello(sd_bus *bus) { assert(bus); + if (!bus->bus_client || bus->is_kernel) + return 0; + r = sd_bus_message_new_method_call( bus, "org.freedesktop.DBus", @@ -118,29 +425,19 @@ static int bus_send_hello(sd_bus *bus) { if (r < 0) return r; - r = sd_bus_send_with_reply(bus, m, hello_callback, NULL, (uint64_t) -1, NULL); - if (r < 0) - return r; - - return 0; + return sd_bus_call_async(bus, m, hello_callback, NULL, 0, &bus->hello_serial); } -static int bus_start_running(sd_bus *bus) { - int r; - +int bus_start_running(sd_bus *bus) { assert(bus); - if (bus->send_hello) { + if (bus->bus_client && !bus->is_kernel) { bus->state = BUS_HELLO; - - r = bus_send_hello(bus); - if (r < 0) - return r; + return 1; } bus->state = BUS_RUNNING; - - return 0; + return 1; } static int parse_address_key(const char **p, const char *key, char **value) { @@ -150,21 +447,24 @@ static int parse_address_key(const char **p, const char *key, char **value) { assert(p); assert(*p); - assert(key); assert(value); - l = strlen(key); - if (!strncmp(*p, key, l) != 0) - return 0; + if (key) { + l = strlen(key); + if (strncmp(*p, key, l) != 0) + return 0; - if ((*p)[l] != '=') - return 0; + if ((*p)[l] != '=') + return 0; - if (*value) - return -EINVAL; + if (*value) + return -EINVAL; + + a = *p + l + 1; + } else + a = *p; - a = *p + l + 1; - while (*a != ';' && *a != 0) { + while (*a != ';' && *a != ',' && *a != 0) { char c, *t; if (*a == '%') { @@ -182,12 +482,14 @@ static int parse_address_key(const char **p, const char *key, char **value) { return y; } - a += 3; c = (char) ((x << 4) | y); - } else + a += 3; + } else { c = *a; + a++; + } - t = realloc(r, n + 1); + t = realloc(r, n + 2); if (!t) { free(r); return -ENOMEM; @@ -197,8 +499,21 @@ static int parse_address_key(const char **p, const char *key, char **value) { r[n++] = c; } + if (!r) { + r = strdup(""); + if (!r) + return -ENOMEM; + } else + r[n] = 0; + + if (*a == ',') + a++; + *p = a; + + free(*value); *value = r; + return 1; } @@ -206,724 +521,824 @@ static void skip_address_key(const char **p) { assert(p); assert(*p); - *p += strcspn(*p, ";"); + *p += strcspn(*p, ","); + + if (**p == ',') + (*p) ++; } -static int bus_parse_next_address(sd_bus *b) { - const char *a, *p; - _cleanup_free_ char *guid = NULL; +static int parse_unix_address(sd_bus *b, const char **p, char **guid) { + _cleanup_free_ char *path = NULL, *abstract = NULL; + size_t l; int r; assert(b); + assert(p); + assert(*p); + assert(guid); - if (!b->address) - return 0; - if (b->address[b->address_index] == 0) - return 0; + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + return r; + else if (r > 0) + continue; - a = b->address + b->address_index; + r = parse_address_key(p, "path", &path); + if (r < 0) + return r; + else if (r > 0) + continue; - zero(b->sockaddr); - b->sockaddr_size = 0; - b->peer = SD_ID128_NULL; + r = parse_address_key(p, "abstract", &abstract); + if (r < 0) + return r; + else if (r > 0) + continue; - if (startswith(a, "unix:")) { - _cleanup_free_ char *path = NULL, *abstract = NULL; + skip_address_key(p); + } - p = a + 5; - while (*p != 0 && *p != ';') { - r = parse_address_key(&p, "guid", &guid); - if (r < 0) - return r; - else if (r > 0) - continue; + if (!path && !abstract) + return -EINVAL; - r = parse_address_key(&p, "path", &path); - if (r < 0) - return r; - else if (r > 0) - continue; + if (path && abstract) + return -EINVAL; - r = parse_address_key(&p, "abstract", &abstract); - if (r < 0) - return r; - else if (r > 0) - continue; + if (path) { + l = strlen(path); + if (l > sizeof(b->sockaddr.un.sun_path)) + return -E2BIG; + + b->sockaddr.un.sun_family = AF_UNIX; + strncpy(b->sockaddr.un.sun_path, path, sizeof(b->sockaddr.un.sun_path)); + b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + l; + } else if (abstract) { + l = strlen(abstract); + if (l > sizeof(b->sockaddr.un.sun_path) - 1) + return -E2BIG; + + b->sockaddr.un.sun_family = AF_UNIX; + b->sockaddr.un.sun_path[0] = 0; + strncpy(b->sockaddr.un.sun_path+1, abstract, sizeof(b->sockaddr.un.sun_path)-1); + b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + 1 + l; + } - skip_address_key(&p); - } + return 0; +} - if (!path && !abstract) - return -EINVAL; +static int parse_tcp_address(sd_bus *b, const char **p, char **guid) { + _cleanup_free_ char *host = NULL, *port = NULL, *family = NULL; + int r; + struct addrinfo *result, hints = { + .ai_socktype = SOCK_STREAM, + .ai_flags = AI_ADDRCONFIG, + }; - if (path && abstract) - return -EINVAL; + assert(b); + assert(p); + assert(*p); + assert(guid); - if (path) { - size_t l; + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + return r; + else if (r > 0) + continue; - l = strlen(path); - if (l > sizeof(b->sockaddr.un.sun_path)) - return -E2BIG; + r = parse_address_key(p, "host", &host); + if (r < 0) + return r; + else if (r > 0) + continue; - b->sockaddr.un.sun_family = AF_UNIX; - strncpy(b->sockaddr.un.sun_path, path, sizeof(b->sockaddr.un.sun_path)); - b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + l; - } else if (abstract) { - size_t l; + r = parse_address_key(p, "port", &port); + if (r < 0) + return r; + else if (r > 0) + continue; - l = strlen(path); - if (l > sizeof(b->sockaddr.un.sun_path) - 1) - return -E2BIG; + r = parse_address_key(p, "family", &family); + if (r < 0) + return r; + else if (r > 0) + continue; - b->sockaddr.un.sun_family = AF_UNIX; - b->sockaddr.un.sun_path[0] = 0; - strncpy(b->sockaddr.un.sun_path+1, path, sizeof(b->sockaddr.un.sun_path)-1); - b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + 1 + l; - } + skip_address_key(p); + } - } else if (startswith(a, "tcp:")) { - _cleanup_free_ char *host = NULL, *port = NULL, *family = NULL; - struct addrinfo hints, *result; + if (!host || !port) + return -EINVAL; - p = a + 4; - while (*p != 0 && *p != ';') { - r = parse_address_key(&p, "guid", &guid); - if (r < 0) - return r; - else if (r > 0) - continue; + if (family) { + if (streq(family, "ipv4")) + hints.ai_family = AF_INET; + else if (streq(family, "ipv6")) + hints.ai_family = AF_INET6; + else + return -EINVAL; + } - r = parse_address_key(&p, "host", &host); - if (r < 0) - return r; - else if (r > 0) - continue; + r = getaddrinfo(host, port, &hints, &result); + if (r == EAI_SYSTEM) + return -errno; + else if (r != 0) + return -EADDRNOTAVAIL; - r = parse_address_key(&p, "port", &port); - if (r < 0) - return r; - else if (r > 0) - continue; + memcpy(&b->sockaddr, result->ai_addr, result->ai_addrlen); + b->sockaddr_size = result->ai_addrlen; - r = parse_address_key(&p, "family", &family); - if (r < 0) - return r; - else if (r > 0) - continue; + freeaddrinfo(result); - skip_address_key(&p); - } + return 0; +} - if (!host || !port) - return -EINVAL; +static int parse_exec_address(sd_bus *b, const char **p, char **guid) { + char *path = NULL; + unsigned n_argv = 0, j; + char **argv = NULL; + int r; - zero(hints); - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_ADDRCONFIG; - - if (family) { - if (streq(family, "ipv4")) - hints.ai_family = AF_INET; - else if (streq(family, "ipv6")) - hints.ai_family = AF_INET6; - else - return -EINVAL; - } + assert(b); + assert(p); + assert(*p); + assert(guid); - r = getaddrinfo(host, port, &hints, &result); - if (r == EAI_SYSTEM) - return -errno; - else if (r != 0) - return -EADDRNOTAVAIL; + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + goto fail; + else if (r > 0) + continue; - memcpy(&b->sockaddr, result->ai_addr, result->ai_addrlen); - b->sockaddr_size = result->ai_addrlen; + r = parse_address_key(p, "path", &path); + if (r < 0) + goto fail; + else if (r > 0) + continue; - freeaddrinfo(result); - } + if (startswith(*p, "argv")) { + unsigned ul; - if (guid) { - r = sd_id128_from_string(guid, &b->peer); - if (r < 0) - return r; - } + errno = 0; + ul = strtoul(*p + 4, (char**) p, 10); + if (errno > 0 || **p != '=' || ul > 256) { + r = -EINVAL; + goto fail; + } - b->address_index = p - b->address; - return 1; -} + (*p) ++; + + if (ul >= n_argv) { + char **x; -static void iovec_advance(struct iovec *iov, unsigned *idx, size_t size) { + x = realloc(argv, sizeof(char*) * (ul + 2)); + if (!x) { + r = -ENOMEM; + goto fail; + } - while (size > 0) { - struct iovec *i = iov + *idx; + memset(x + n_argv, 0, sizeof(char*) * (ul - n_argv + 2)); - if (i->iov_len > size) { - i->iov_base = (uint8_t*) i->iov_base + size; - i->iov_len -= size; - return; - } + argv = x; + n_argv = ul + 1; + } - size -= i->iov_len; + r = parse_address_key(p, NULL, argv + ul); + if (r < 0) + goto fail; - i->iov_base = NULL; - i->iov_len = 0; + continue; + } - (*idx) ++; + skip_address_key(p); } -} - -static int bus_write_auth(sd_bus *b) { - struct msghdr mh; - ssize_t k; - assert(b); - assert(b->state == BUS_AUTHENTICATING); + if (!path) { + r = -EINVAL; + goto fail; + } - if (b->auth_index >= ELEMENTSOF(b->auth_iovec)) - return 0; + /* Make sure there are no holes in the array, with the + * exception of argv[0] */ + for (j = 1; j < n_argv; j++) + if (!argv[j]) { + r = -EINVAL; + goto fail; + } - zero(mh); - mh.msg_iov = b->auth_iovec + b->auth_index; - mh.msg_iovlen = ELEMENTSOF(b->auth_iovec) - b->auth_index; + if (argv && argv[0] == NULL) { + argv[0] = strdup(path); + if (!argv[0]) { + r = -ENOMEM; + goto fail; + } + } - k = sendmsg(b->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL); - if (k < 0) - return errno == EAGAIN ? 0 : -errno; + b->exec_path = path; + b->exec_argv = argv; + return 0; - iovec_advance(b->auth_iovec, &b->auth_index, (size_t) k); +fail: + for (j = 0; j < n_argv; j++) + free(argv[j]); - return 1; + free(argv); + free(path); + return r; } -static int bus_auth_verify(sd_bus *b) { - char *e, *f; - sd_id128_t peer; - unsigned i; +static int parse_kernel_address(sd_bus *b, const char **p, char **guid) { + _cleanup_free_ char *path = NULL; int r; - /* We expect two response lines: "OK", "AGREE_UNIX_FD", and - * that's it */ + assert(b); + assert(p); + assert(*p); + assert(guid); - e = memmem(b->rbuffer, b->rbuffer_size, "\r\n", 2); - if (!e) - return 0; + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + return r; + else if (r > 0) + continue; - f = memmem(e, b->rbuffer_size - (e - (char*) b->rbuffer), "\r\n", 2); - if (!f) - return 0; + r = parse_address_key(p, "path", &path); + if (r < 0) + return r; + else if (r > 0) + continue; - if (e - (char*) b->rbuffer != 3 + 32) - return -EPERM; + skip_address_key(p); + } - if (memcmp(b->rbuffer, "OK ", 3)) - return -EPERM; + if (!path) + return -EINVAL; - for (i = 0; i < 32; i += 2) { - int x, y; + free(b->kernel); + b->kernel = path; + path = NULL; - x = unhexchar(((char*) b->rbuffer)[3 + i]); - y = unhexchar(((char*) b->rbuffer)[3 + i + 2]); + return 0; +} - if (x < 0 || y < 0) - return -EINVAL; +static int parse_container_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; - peer.bytes[i/2] = ((uint8_t) x << 4 | (uint8_t) y); + skip_address_key(p); } - if (!sd_id128_equal(b->peer, SD_ID128_NULL) && - !sd_id128_equal(b->peer, peer)) - return -EPERM; + if (!machine) + return -EINVAL; - b->peer = peer; + free(b->machine); + b->machine = machine; + machine = NULL; - b->can_fds = - (f - e == sizeof("\r\nAGREE_UNIX_FD") - 1) && - memcmp(e + 2, "AGREE_UNIX_FD", sizeof("AGREE_UNIX_FD") - 1) == 0; + 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; - if (f + 2 > (char*) b->rbuffer + b->rbuffer_size) { - b->rbuffer_size -= (f - (char*) b->rbuffer); - memmove(b->rbuffer, f + 2, b->rbuffer_size); - } + return 0; +} - r = bus_start_running(b); - if (r < 0) - return r; +static void bus_reset_parsed_address(sd_bus *b) { + assert(b); - return 1; + zero(b->sockaddr); + b->sockaddr_size = 0; + strv_free(b->exec_argv); + free(b->exec_path); + b->exec_path = NULL; + b->exec_argv = NULL; + b->server_id = SD_ID128_NULL; + free(b->kernel); + b->kernel = NULL; + free(b->machine); + b->machine = NULL; } -static int bus_read_auth(sd_bus *b) { - struct msghdr mh; - struct iovec iov; - size_t n; - ssize_t k; +static int bus_parse_next_address(sd_bus *b) { + _cleanup_free_ char *guid = NULL; + const char *a; int r; assert(b); - r = bus_auth_verify(b); - if (r != 0) - return r; + if (!b->address) + return 0; + if (b->address[b->address_index] == 0) + return 0; - n = MAX(3 + 32 + 2 + sizeof("AGREE_UNIX_FD") - 1 + 2, b->rbuffer_size * 2); + bus_reset_parsed_address(b); + + a = b->address + b->address_index; - zero(iov); - iov.iov_base = (uint8_t*) b->rbuffer + b->rbuffer_size; - iov.iov_len = n - b->rbuffer_size; + while (*a != 0) { - zero(mh); - mh.msg_iov = &iov; - mh.msg_iovlen = 1; + if (*a == ';') { + a++; + continue; + } - k = recvmsg(b->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL); - if (k < 0) - return errno == EAGAIN ? 0 : -errno; + if (startswith(a, "unix:")) { + a += 5; - b->rbuffer_size += k; + r = parse_unix_address(b, &a, &guid); + if (r < 0) + return r; + break; - r = bus_auth_verify(b); - if (r != 0) - return r; + } else if (startswith(a, "tcp:")) { - return 0; -} + a += 4; + r = parse_tcp_address(b, &a, &guid); + if (r < 0) + return r; -static int bus_start_auth(sd_bus *b) { - static const char auth_prefix[] = "\0AUTH_EXTERNAL "; - static const char auth_suffix[] = "\r\nNEGOTIATE_UNIX_FD\r\nBEGIN\r\n"; + break; - char text[20 + 1]; /* enough space for a 64bit integer plus NUL */ - size_t l; + } else if (startswith(a, "unixexec:")) { - assert(b); + a += 9; + r = parse_exec_address(b, &a, &guid); + if (r < 0) + return r; - b->state = BUS_AUTHENTICATING; + break; - snprintf(text, sizeof(text), "%llu", (unsigned long long) geteuid()); - char_array_0(text); + } else if (startswith(a, "kernel:")) { - l = strlen(text); - b->auth_uid = hexmem(text, l); - if (!b->auth_uid) - return -ENOMEM; + a += 7; + r = parse_kernel_address(b, &a, &guid); + if (r < 0) + return r; + + break; + } else if (startswith(a, "x-container:")) { + + a += 12; + r = parse_container_address(b, &a, &guid); + if (r < 0) + return r; + + break; + } - b->auth_iovec[0].iov_base = (void*) auth_prefix; - b->auth_iovec[0].iov_len = sizeof(auth_prefix) -1; - b->auth_iovec[1].iov_base = (void*) b->auth_uid; - b->auth_iovec[1].iov_len = l * 2; - b->auth_iovec[2].iov_base = (void*) auth_suffix; - b->auth_iovec[2].iov_len = sizeof(auth_suffix) -1; - b->auth_size = sizeof(auth_prefix) - 1 + l * 2 + sizeof(auth_suffix) - 1; + a = strchr(a, ';'); + if (!a) + return 0; + } + + if (guid) { + r = sd_id128_from_string(guid, &b->server_id); + if (r < 0) + return r; + } - return bus_write_auth(b); + b->address_index = a - b->address; + return 1; } -static int bus_start_connect(sd_bus *b) { +static int bus_start_address(sd_bus *b) { int r; assert(b); - assert(b->fd < 0); for (;;) { - if (b->sockaddr.sa.sa_family == AF_UNSPEC) { - r = bus_parse_next_address(b); - if (r < 0) + sd_bus_close(b); + + if (b->exec_path) { + + r = bus_socket_exec(b); + if (r >= 0) return r; - if (r == 0) - return b->last_connect_error ? b->last_connect_error : -ECONNREFUSED; - } - b->fd = socket(b->sockaddr.sa.sa_family, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); - if (b->fd < 0) { - b->last_connect_error = -errno; - zero(b->sockaddr); - continue; - } + b->last_connect_error = -r; + } else if (b->kernel) { - r = connect(b->fd, &b->sockaddr.sa, b->sockaddr_size); - if (r < 0) { - if (errno == EINPROGRESS) - return 0; + r = bus_kernel_connect(b); + if (r >= 0) + return r; - b->last_connect_error = -errno; - close_nointr_nofail(b->fd); - b->fd = -1; - zero(b->sockaddr); - continue; + b->last_connect_error = -r; + + } else if (b->machine) { + + r = bus_container_connect(b); + if (r >= 0) + return r; + + b->last_connect_error = -r; + + } else if (b->sockaddr.sa.sa_family != AF_UNSPEC) { + + r = bus_socket_connect(b); + if (r >= 0) + return r; + + b->last_connect_error = -r; } - return bus_start_auth(b); + r = bus_parse_next_address(b); + if (r < 0) + return r; + if (r == 0) + return b->last_connect_error ? -b->last_connect_error : -ECONNREFUSED; } } -int sd_bus_open_system(sd_bus **ret) { - const char *e; - sd_bus *b; +int bus_next_address(sd_bus *b) { + assert(b); + + bus_reset_parsed_address(b); + return bus_start_address(b); +} + +static int bus_start_fd(sd_bus *b) { + struct stat st; int r; - if (!ret) - return -EINVAL; + assert(b); + assert(b->input_fd >= 0); + assert(b->output_fd >= 0); - e = getenv("DBUS_SYSTEM_BUS_ADDRESS"); - if (e) { - r = sd_bus_open_address(e, &b); + r = fd_nonblock(b->input_fd, true); + if (r < 0) + return r; + + r = fd_cloexec(b->input_fd, true); + if (r < 0) + return r; + + if (b->input_fd != b->output_fd) { + r = fd_nonblock(b->output_fd, true); if (r < 0) return r; - b->send_hello = true; - *ret = b; - return r; + r = fd_cloexec(b->output_fd, true); + if (r < 0) + return r; } - b = bus_new(); - if (!b) - return -ENOMEM; + if (fstat(b->input_fd, &st) < 0) + return -errno; - b->send_hello = true; + if (S_ISCHR(b->input_fd)) + return bus_kernel_take_fd(b); + else + return bus_socket_take_fd(b); +} - 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; +_public_ int sd_bus_start(sd_bus *bus) { + int r; - r = bus_start_connect(b); - if (r < 0) { - bus_free(b); + assert_return(bus, -EINVAL); + assert_return(bus->state == BUS_UNSET, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); + + bus->state = BUS_OPENING; + + if (bus->is_server && bus->bus_client) + return -EINVAL; + + 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 || bus->machine) + r = bus_start_address(bus); + else + return -EINVAL; + + if (r < 0) return r; - } - *ret = b; - return 0; + return bus_send_hello(bus); } -int sd_bus_open_user(sd_bus **ret) { +_public_ int sd_bus_open_system(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_SYSTEM_BUS_ADDRESS"); if (e) { - r = sd_bus_open_address(e, &b); + r = sd_bus_set_address(b, e); if (r < 0) - return r; - - b->send_hello = true; - *ret = b; - return r; + 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; } - e = getenv("XDG_RUNTIME_DIR"); - if (!e) - return -ENOENT; + b->bus_client = true; - l = strlen(e); - if (l + 4 > sizeof(b->sockaddr.un.sun_path)) - return -E2BIG; + r = sd_bus_start(b); + if (r < 0) + goto fail; - b = bus_new(); - if (!b) - return -ENOMEM; + *ret = b; + return 0; - b->send_hello = true; +fail: + bus_free(b); + return r; +} - 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; +_public_ int sd_bus_open_user(sd_bus **ret) { + const char *e; + sd_bus *b; + size_t l; + int r; - r = bus_start_connect(b); - if (r < 0) { - bus_free(b); + assert_return(ret, -EINVAL); + + r = sd_bus_new(&b); + if (r < 0) return r; + + e = secure_getenv("DBUS_SESSION_BUS_ADDRESS"); + if (e) { + r = sd_bus_set_address(b, e); + if (r < 0) + goto fail; + } else { + e = secure_getenv("XDG_RUNTIME_DIR"); + if (!e) { + r = -ENOENT; + goto fail; + } + + l = strlen(e); + if (l + 4 > sizeof(b->sockaddr.un.sun_path)) { + r = -E2BIG; + 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; + + r = sd_bus_start(b); + if (r < 0) + goto fail; + *ret = b; return 0; + +fail: + bus_free(b); + return r; } -int sd_bus_open_address(const char *address, sd_bus **ret) { - sd_bus *b; +_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; - if (!address) - return -EINVAL; - if (!ret) - return -EINVAL; + assert_return(host, -EINVAL); + assert_return(ret, -EINVAL); - b = bus_new(); - if (!b) + e = bus_address_escape(host); + if (!e) return -ENOMEM; - b->address = strdup(address); - if (!b->address) { - bus_free(b); + p = strjoin("unixexec:path=ssh,argv1=-xT,argv2=", e, ",argv3=systemd-stdio-bridge", NULL); + if (!p) return -ENOMEM; + + r = sd_bus_new(&bus); + if (r < 0) { + free(p); + return r; } - r = bus_start_connect(b); + bus->address = p; + bus->bus_client = true; + + r = sd_bus_start(bus); if (r < 0) { - bus_free(b); + bus_free(bus); return r; } - *ret = b; + *ret = bus; return 0; } -int sd_bus_open_fd(int fd, sd_bus **ret) { - sd_bus *b; +_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; - if (fd < 0) - return -EINVAL; - if (!ret) - return -EINVAL; + assert_return(machine, -EINVAL); + assert_return(ret, -EINVAL); + + e = bus_address_escape(machine); + if (!e) + return -ENOMEM; - b = bus_new(); - if (!b) + p = strjoin("x-container:machine=", e, NULL); + if (!p) return -ENOMEM; - b->fd = fd; - fd_nonblock(b->fd, true); - fd_cloexec(b->fd, true); + r = sd_bus_new(&bus); + if (r < 0) { + free(p); + return r; + } + + bus->address = p; + bus->bus_client = true; - r = bus_start_auth(b); + r = sd_bus_start(bus); if (r < 0) { - bus_free(b); + bus_free(bus); return r; } - *ret = b; + *ret = bus; return 0; } -void sd_bus_close(sd_bus *bus) { +_public_ void sd_bus_close(sd_bus *bus) { + if (!bus) return; - if (bus->fd < 0) + if (bus->state == BUS_CLOSED) + return; + if (bus_pid_changed(bus)) return; - close_nointr_nofail(bus->fd); - bus->fd = -1; + 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_MSG_RELEASE ioctl on the fd when they are + * freed. */ } -sd_bus *sd_bus_ref(sd_bus *bus) { - if (!bus) - return NULL; +static void bus_enter_closing(sd_bus *bus) { + assert(bus); - assert(bus->n_ref > 0); + if (bus->state != BUS_OPENING && + bus->state != BUS_AUTHENTICATING && + bus->state != BUS_HELLO && + bus->state != BUS_RUNNING) + return; - bus->n_ref++; - return bus; + bus->state = BUS_CLOSING; } -sd_bus *sd_bus_unref(sd_bus *bus) { - if (!bus) - return NULL; +_public_ sd_bus *sd_bus_ref(sd_bus *bus) { + assert_return(bus, NULL); + + assert_se(REFCNT_INC(bus->n_ref) >= 2); + + return bus; +} - assert(bus->n_ref > 0); - bus->n_ref--; +_public_ sd_bus *sd_bus_unref(sd_bus *bus) { + assert_return(bus, NULL); - if (bus->n_ref <= 0) + if (REFCNT_DEC(bus->n_ref) <= 0) bus_free(bus); return NULL; } -int sd_bus_is_running(sd_bus *bus) { - if (!bus) - return -EINVAL; +_public_ int sd_bus_is_open(sd_bus *bus) { - if (bus->fd < 0) - return -ENOTCONN; + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); - return bus->state == BUS_RUNNING; + return BUS_IS_OPEN(bus->state); } -int sd_bus_can_send(sd_bus *bus, char type) { +_public_ int sd_bus_can_send(sd_bus *bus, char type) { + int r; - if (!bus) - return -EINVAL; + 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) - return bus->can_fds; - - return bus_type_is_valid(type); -} - -static int bus_seal_message(sd_bus *b, sd_bus_message *m) { - assert(m); - - if (m->sealed) - return 0; - - return bus_message_seal(m, ++b->serial); -} - -static int message_write(sd_bus *bus, sd_bus_message *m, size_t *idx) { - struct msghdr mh; - struct iovec *iov; - ssize_t k; - size_t n; - unsigned j; - - assert(bus); - assert(m); - assert(idx); - - n = m->n_iovec * sizeof(struct iovec); - iov = alloca(n); - memcpy(iov, m->iovec, n); - - j = 0; - iovec_advance(iov, &j, *idx); - - zero(mh); - mh.msg_iov = iov; - mh.msg_iovlen = m->n_iovec; + if (type == SD_BUS_TYPE_UNIX_FD) { + if (!(bus->hello_flags & KDBUS_HELLO_ACCEPT_FD)) + return 0; - k = sendmsg(bus->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL); - if (k < 0) - return -errno; + r = bus_ensure_running(bus); + if (r < 0) + return r; - *idx += (size_t) k; - iovec_advance(iov, &j, *idx); + return bus->can_fds; + } - return j > m->n_iovec; + return bus_type_is_valid(type); } -static int message_read_need(sd_bus *bus, size_t *need) { - uint32_t a, b; - uint8_t e; - - assert(bus); - assert(need); - - if (bus->rbuffer_size <= sizeof(struct bus_header)) { - *need = sizeof(struct bus_header); - return 0; - } +_public_ int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) { + int r; - a = ((const uint32_t*) bus->rbuffer)[1]; - b = ((const uint32_t*) bus->rbuffer)[3]; + assert_return(bus, -EINVAL); + assert_return(server_id, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); - e = ((const uint8_t*) bus->rbuffer)[0]; - if (e == SD_BUS_LITTLE_ENDIAN) { - a = le32toh(a); - b = le32toh(b); - } else if (e == SD_BUS_BIG_ENDIAN) { - a = be32toh(a); - b = be32toh(b); - } else - return -EIO; + r = bus_ensure_running(bus); + if (r < 0) + return r; - *need = sizeof(struct bus_header) + ALIGN_TO(a, 8) + b; + *server_id = bus->server_id; return 0; } -static int message_make(sd_bus *bus, size_t size, sd_bus_message **m) { - sd_bus_message *t; - void *b = NULL; - int r; - - assert(bus); +static int bus_seal_message(sd_bus *b, sd_bus_message *m) { assert(m); - assert(bus->rbuffer_size >= size); - - if (bus->rbuffer_size > size) { - b = memdup((const uint8_t*) bus->rbuffer + size, bus->rbuffer_size - size); - if (!b) { - free(t); - return -ENOMEM; - } - } - - r = bus_message_from_malloc(bus->rbuffer, size, &t); - if (r < 0) { - free(b); - return r; - } - bus->rbuffer = b; - bus->rbuffer_size -= size; + if (m->header->version > b->message_version) + return -EPERM; - r = bus_message_parse(t); - if (r < 0) { - sd_bus_message_unref(t); - return r; + 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; } - *m = t; - return 1; + return bus_message_seal(m, ++b->serial); } -static int message_read(sd_bus *bus, sd_bus_message **m) { - struct msghdr mh; - struct iovec iov; - ssize_t k; - size_t need; +static int bus_write_message(sd_bus *bus, sd_bus_message *message, size_t *idx) { int r; - void *b; assert(bus); - assert(m); - - r = message_read_need(bus, &need); - if (r < 0) - return r; - - if (bus->rbuffer_size >= need) - return message_make(bus, need, m); - - b = realloc(bus->rbuffer, need); - if (!b) - return -ENOMEM; - - zero(iov); - iov.iov_base = (uint8_t*) bus->rbuffer + bus->rbuffer_size; - iov.iov_len = need - bus->rbuffer_size; - - zero(mh); - mh.msg_iov = &iov; - mh.msg_iovlen = 1; - - k = recvmsg(bus->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL); - if (k < 0) - return errno == EAGAIN ? 0 : -errno; - - bus->rbuffer_size += k; + assert(message); - r = message_read_need(bus, &need); - if (r < 0) - return r; + if (bus->is_kernel) + r = bus_kernel_write_message(bus, message); + else + r = bus_socket_write_message(bus, message, idx); - if (bus->rbuffer_size >= need) - return message_make(bus, need, m); - - return 0; + return r; } static int dispatch_wqueue(sd_bus *bus) { - int r, c = 0; + int r, ret = 0; assert(bus); - - if (bus->fd < 0) - return -ENOTCONN; + assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); while (bus->wqueue_size > 0) { - r = message_write(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) - /* Wasn't fully written yet... */ - break; - else { + 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])) { /* Fully written. Let's drop the entry from * the queue. * @@ -939,21 +1354,34 @@ static int dispatch_wqueue(sd_bus *bus) { memmove(bus->wqueue, bus->wqueue + 1, sizeof(sd_bus_message*) * bus->wqueue_size); bus->windex = 0; - c++; + ret = 1; } } - return c; + return ret; } -static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) { +static int bus_read_message(sd_bus *bus, sd_bus_message **m) { int r; assert(bus); assert(m); - if (bus->fd < 0) - return -ENOTCONN; + if (bus->is_kernel) + r = bus_kernel_read_message(bus, m); + else + r = bus_socket_read_message(bus, m); + + return r; +} + +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->rqueue_size > 0) { /* Dispatch a queued message */ @@ -965,26 +1393,40 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) { } /* Try to read a new message */ - r = message_read(bus, m); - if (r < 0) { - sd_bus_close(bus); - return r; - } + do { + r = bus_read_message(bus, &z); + if (r < 0) + return r; + if (r == 0) + return ret; - return r; + ret = 1; + } while (!z); + + *m = z; + return ret; } -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->fd < 0) - return -ENOTCONN; - if (!m) - return -EINVAL; - if (m->header->version > bus->message_version) - return -EPERM; + 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); + if (r < 0) + return r; + if (r == 0) + return -ENOTSUP; + } + + /* 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; r = bus_seal_message(bus, m); if (r < 0) @@ -993,16 +1435,15 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { /* 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->wqueue_size <= 0) { + if ((bus->state == BUS_RUNNING || bus->state == BUS_HELLO) && bus->wqueue_size <= 0) { size_t idx = 0; - r = message_write(bus, m, &idx); - if (r < 0) { - sd_bus_close(bus); + r = bus_write_message(bus, m, &idx); + if (r < 0) return r; - } else if (r == 0) { + else if (!bus->is_kernel && idx < BUS_MESSAGE_SIZE(m)) { /* Wasn't fully written. So let's remember how * much was written. Note that the first entry * of the wqueue array is always allocated so @@ -1017,7 +1458,7 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { /* Just append it to the queue. */ - if (bus->wqueue_size >= WQUEUE_MAX) + if (bus->wqueue_size >= BUS_WQUEUE_MAX) return -ENOBUFS; q = realloc(bus->wqueue, sizeof(sd_bus_message*) * (bus->wqueue_size + 1)); @@ -1031,7 +1472,28 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { 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) { @@ -1039,15 +1501,33 @@ static usec_t calc_elapse(uint64_t usec) { return 0; if (usec == 0) - usec = SD_BUS_DEFAULT_TIMEOUT; + usec = BUS_DEFAULT_TIMEOUT; return now(CLOCK_MONOTONIC) + usec; } -int sd_bus_send_with_reply( +static int timeout_compare(const void *a, const void *b) { + const struct reply_callback *x = a, *y = b; + + if (x->timeout != 0 && y->timeout == 0) + return -1; + + if (x->timeout == 0 && y->timeout != 0) + return 1; + + if (x->timeout < y->timeout) + return -1; + + if (x->timeout > y->timeout) + return 1; + + return 0; +} + +_public_ int sd_bus_call_async( sd_bus *bus, sd_bus_message *m, - sd_message_handler_t callback, + sd_bus_message_handler_t callback, void *userdata, uint64_t usec, uint64_t *serial) { @@ -1055,22 +1535,29 @@ int sd_bus_send_with_reply( struct reply_callback *c; int r; - if (!bus) - return -EINVAL; - if (!bus->fd < 0) - return -ENOTCONN; - if (!m) - return -EINVAL; - if (!callback) - return -EINVAL; - if (!m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) - 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 & SD_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 = bus_seal_message(bus, m); if (r < 0) return r; - c = new(struct reply_callback, 1); + c = new0(struct reply_callback, 1); if (!c) return -ENOMEM; @@ -1085,33 +1572,68 @@ int sd_bus_send_with_reply( return r; } + if (c->timeout != 0) { + r = prioq_put(bus->reply_callbacks_prioq, c, &c->prioq_idx); + if (r < 0) { + c->timeout = 0; + sd_bus_call_async_cancel(bus, c->serial); + return r; + } + } + r = sd_bus_send(bus, m, serial); if (r < 0) { - hashmap_remove(bus->reply_callbacks, &c->serial); - free(c); + 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) { - struct reply_callbacks *c; +_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) return 0; + if (c->timeout != 0) + prioq_remove(bus->reply_callbacks_prioq, c, &c->prioq_idx); + free(c); return 1; } -int sd_bus_send_with_reply_and_block( +int bus_ensure_running(sd_bus *bus) { + int r; + + assert(bus); + + if (bus->state == BUS_UNSET || bus->state == BUS_CLOSED || bus->state == BUS_CLOSING) + return -ENOTCONN; + if (bus->state == BUS_RUNNING) + return 1; + + for (;;) { + r = sd_bus_process(bus, NULL); + if (r < 0) + return r; + if (bus->state == BUS_RUNNING) + return 1; + if (r > 0) + continue; + + r = sd_bus_wait(bus, (uint64_t) -1); + if (r < 0) + return r; + } +} + +_public_ int sd_bus_call( sd_bus *bus, sd_bus_message *m, uint64_t usec, @@ -1123,16 +1645,17 @@ int sd_bus_send_with_reply_and_block( uint64_t serial; bool room = false; - if (!bus) - return -EINVAL; - if (!bus->fd < 0) - return -ENOTCONN; - if (!m) - return -EINVAL; - if (!m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) - return -EINVAL; - if (sd_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 & SD_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; r = sd_bus_send(bus, m, &serial); if (r < 0) @@ -1142,11 +1665,14 @@ int sd_bus_send_with_reply_and_block( for (;;) { usec_t left; - sd_bus_message *incoming; + 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 */ @@ -1158,19 +1684,26 @@ int sd_bus_send_with_reply_and_block( room = true; } - r = message_read(bus, &incoming); + r = bus_read_message(bus, &incoming); if (r < 0) return r; - if (r > 0) { + + if (incoming) { + if (incoming->reply_serial == serial) { /* Found a match! */ - if (incoming->header->type == SD_BUS_MESSAGE_TYPE_METHOD_RETURN) { - *reply = incoming; - return 0; + if (incoming->header->type == SD_BUS_MESSAGE_METHOD_RETURN) { + + if (reply) + *reply = incoming; + else + sd_bus_message_unref(incoming); + + return 1; } - if (incoming->header->type == SD_BUS_MESSAGE_TYPE_METHOD_ERROR) { + if (incoming->header->type == SD_BUS_MESSAGE_METHOD_ERROR) { int k; r = sd_bus_error_copy(error, &incoming->error); @@ -1179,13 +1712,26 @@ int sd_bus_send_with_reply_and_block( return r; } - k = bus_error_to_errno(&incoming->error); + k = sd_bus_error_get_errno(&incoming->error); sd_bus_message_unref(incoming); - return k; + return -k; } sd_bus_message_unref(incoming); return -EIO; + + } else if (incoming->header->serial == serial && + bus->unique_name && + incoming->sender && + streq(bus->unique_name, incoming->sender)) { + + /* 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 -ELOOP; } /* There's already guaranteed to be room for @@ -1196,6 +1742,8 @@ int sd_bus_send_with_reply_and_block( /* Try to read more, right-away */ continue; } + if (r != 0) + continue; if (timeout > 0) { usec_t n; @@ -1208,7 +1756,7 @@ int sd_bus_send_with_reply_and_block( } else left = (uint64_t) -1; - r = sd_bus_wait(bus, left); + r = bus_poll(bus, true, left); if (r < 0) return r; @@ -1218,28 +1766,32 @@ int sd_bus_send_with_reply_and_block( } } -int sd_bus_get_fd(sd_bus *bus) { - if (!bus) - return -EINVAL; +_public_ int sd_bus_get_fd(sd_bus *bus) { - if (bus->fd < 0) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(bus->input_fd == bus->output_fd, -EPERM); + assert_return(!bus_pid_changed(bus), -ECHILD); - return bus->fd; + 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->fd < 0) - return -EINVAL; + 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; - else if (bus->state == BUS_RUNNING || bus->state == BUS_HELLO) { + else if (bus->state == BUS_AUTHENTICATING) { + + if (bus_socket_auth_needs_write(bus)) + flags |= POLLOUT; + + flags |= POLLIN; + + } else if (bus->state == BUS_RUNNING || bus->state == BUS_HELLO) { if (bus->rqueue_size <= 0) flags |= POLLIN; if (bus->wqueue_size > 0) @@ -1249,139 +1801,574 @@ int sd_bus_get_events(sd_bus *bus) { return flags; } -int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { - sd_bus_message *m; - int r; +_public_ int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) { + struct reply_callback *c; - if (!bus) - return -EINVAL; - if (bus->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_OPENING) { - struct pollfd p; + if (bus->state == BUS_CLOSING) { + *timeout_usec = 0; + return 1; + } - zero(p); - p.fd = bus->fd; - p.events = POLLOUT; + if (bus->state == BUS_AUTHENTICATING) { + *timeout_usec = bus->auth_timeout; + return 1; + } - r = poll(&p, 1, 0); - if (r < 0) - return -errno; + if (bus->state != BUS_RUNNING && bus->state != BUS_HELLO) { + *timeout_usec = (uint64_t) -1; + return 0; + } - if (p.revents & (POLLOUT|POLLERR|POLLHUP)) { - int error; - socklen_t slen = sizeof(error); + if (bus->rqueue_size > 0) { + *timeout_usec = 0; + return 1; + } - r = getsockopt(bus->fd, SOL_SOCKET, SO_ERROR, &error, &slen); - if (r < 0) - return -errno; + c = prioq_peek(bus->reply_callbacks_prioq); + if (!c) { + *timeout_usec = (uint64_t) -1; + return 0; + } + + *timeout_usec = c->timeout; + return 1; +} - if (error != 0) - bus->last_connect_error = -error; - else if (p.revents & (POLLERR|POLLHUP)) - bus->last_connect_error = -ECONNREFUSED; - else - return bus_start_auth(bus); +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; - /* Try next address */ - return bus_start_connect(bus); - } + assert(bus); + c = prioq_peek(bus->reply_callbacks_prioq); + if (!c) return 0; - } else if (bus->state == BUS_AUTHENTICATING) { + n = now(CLOCK_MONOTONIC); + if (c->timeout > n) + return 0; - r = bus_write_auth(bus); - if (r < 0) - return r; + 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; - r = bus_read_auth(bus); - if (r <= 0) - return r; + r = bus_seal_message(bus, m); + if (r < 0) + return r; - return bus_start_running(bus); + assert_se(prioq_pop(bus->reply_callbacks_prioq) == c); + hashmap_remove(bus->reply_callbacks, &c->serial); - } else if (bus->state == BUS_RUNNING || bus->state == BUS_HELLO) { - struct filter_callback *l; + bus->current = m; + bus->iteration_counter ++; - r = dispatch_wqueue(bus); - 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); - r = dispatch_rqueue(bus, &m); - if (r <= 0) - return r; + bus->current = NULL; - if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL || m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_RETURN) { - struct reply_callback *c; + return r; +} - c = hashmap_remove(bus->reply_callbacks, &m->reply_serial); - if (c) { - r = c->callback(bus, m, c->userdata); - free(c); +static int process_hello(sd_bus *bus, sd_bus_message *m) { + assert(bus); + assert(m); - if (r != 0) { - sd_bus_message_unref(m); - return r < 0 ? r : 0; - } - } - } + if (bus->state != BUS_HELLO) + return 0; + + /* Let's make sure the first message on the bus is the HELLO + * reply. But note that we don't actually parse the message + * 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_METHOD_RETURN && + m->header->type != SD_BUS_MESSAGE_METHOD_ERROR) + return -EIO; + + if (m->reply_serial != bus->hello_serial) + return -EIO; + + return 0; +} + +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_METHOD_RETURN && + m->header->type != SD_BUS_MESSAGE_METHOD_ERROR) + return 0; + + c = hashmap_remove(bus->reply_callbacks, &m->reply_serial); + if (!c) + return 0; + + if (c->timeout != 0) + prioq_remove(bus->reply_callbacks_prioq, c, &c->prioq_idx); + + 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; + + assert(bus); + assert(m); + + do { + bus->filter_callbacks_modified = false; LIST_FOREACH(callbacks, l, bus->filter_callbacks) { - r = l->callback(bus, m, l->userdata); - if (r != 0) { - sd_bus_message_unref(m); - return r < 0 ? r : 0; - } - } - if (ret) { - *ret = m; - return 1; + if (bus->filter_callbacks_modified) + break; + + /* Don't run this more than once per iteration */ + if (l->last_iteration == bus->iteration_counter) + continue; + + l->last_iteration = bus->iteration_counter; + + 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; + } - sd_bus_message_unref(m); + } while (bus->filter_callbacks_modified); + + return 0; +} + +static int process_match(sd_bus *bus, sd_bus_message *m) { + int r; + + assert(bus); + assert(m); + + do { + bus->match_callbacks_modified = false; + + r = bus_match_run(bus, &bus->match_callbacks, m); + if (r != 0) + return r; + + } while (bus->match_callbacks_modified); + + return 0; +} + +static int process_builtin(sd_bus *bus, sd_bus_message *m) { + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + int r; + + assert(bus); + assert(m); + + 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) + return 1; + + if (streq_ptr(m->member, "Ping")) + r = sd_bus_message_new_method_return(m, &reply); + else if (streq_ptr(m->member, "GetMachineId")) { + sd_id128_t id; + char sid[33]; + + r = sd_id128_get_machine(&id); + if (r < 0) + return r; + + 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 { + r = sd_bus_message_new_method_errorf( + m, &reply, + SD_BUS_ERROR_UNKNOWN_METHOD, + "Unknown method '%s' on interface '%s'.", m->member, m->interface); } - return -ENOTSUP; + if (r < 0) + return r; + + r = sd_bus_send(bus, reply, NULL); + if (r < 0) + return r; + + return 1; } -int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) { - struct pollfd p; - int r, e; +static int process_message(sd_bus *bus, sd_bus_message *m) { + int r; + + assert(bus); + assert(m); + + bus->current = 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) + goto finish; + + r = process_reply(bus, m); + if (r != 0) + goto finish; + + r = process_filter(bus, m); + if (r != 0) + goto finish; + + r = process_match(bus, m); + if (r != 0) + goto finish; + + r = process_builtin(bus, m); + if (r != 0) + goto finish; + + r = bus_process_object(bus, m); + +finish: + bus->current = NULL; + return r; +} + +static int process_running(sd_bus *bus, sd_bus_message **ret) { + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + int r; + + assert(bus); + assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); + + r = process_timeout(bus); + if (r != 0) + goto null_message; + + r = dispatch_wqueue(bus); + if (r != 0) + goto null_message; + + r = dispatch_rqueue(bus, &m); + if (r < 0) + return r; + if (!m) + goto null_message; + + r = process_message(bus, m); + if (r != 0) + 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_METHOD_CALL) { + + r = sd_bus_reply_method_errorf( + m, + SD_BUS_ERROR_UNKNOWN_OBJECT, + "Unknown object '%s'.", m->path); + if (r < 0) + return r; + } + + return 1; + +null_message: + if (r >= 0 && ret) + *ret = NULL; + + return r; +} + +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_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; + + r = bus_seal_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 + * caller to invoke sd_bus_wait() before returning the next + * time. Returns > 0 when we did something, which possibly + * means *ret is filled in with an unprocessed message. */ + + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + /* We don't allow recursively invoking sd_bus_process(). */ + assert_return(!bus->current, -EBUSY); + + switch (bus->state) { + + case BUS_UNSET: + case BUS_CLOSED: + return -ENOTCONN; + + case BUS_OPENING: + r = bus_socket_process_opening(bus); + if (r == -ECONNRESET || r == -EPIPE) { + 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 == -ECONNRESET || r == -EPIPE) { + bus_enter_closing(bus); + r = 1; + } else if (r < 0) + return r; + + if (ret) + *ret = NULL; + + return r; + + case BUS_RUNNING: + case BUS_HELLO: + r = process_running(bus, ret); + if (r == -ECONNRESET || r == -EPIPE) { + 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"); +} + +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 m = (usec_t) -1; - if (!bus) - return -EINVAL; - if (bus->fd < 0) - return -ECONNREFUSED; + assert(bus); + + 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; - zero(p); - p.fd = bus->fd; - p.events = 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; + else { + 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)) + m = timeout_usec; - r = ppoll(&p, 1, timeout_usec == (uint64_t) -1 ? NULL : timespec_store(&ts, timeout_usec), NULL); + p[0].fd = bus->input_fd; + if (bus->output_fd == bus->input_fd) { + p[0].events = e; + n = 1; + } else { + p[0].events = e & POLLIN; + p[1].fd = bus->output_fd; + p[1].events = e & POLLOUT; + n = 2; + } + + r = ppoll(p, n, m == (uint64_t) -1 ? NULL : timespec_store(&ts, m), NULL); if (r < 0) - return -EINVAL; + return -errno; - return r; + return r > 0 ? 1 : 0; } -int sd_bus_flush(sd_bus *bus) { +_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->rqueue_size > 0) + return 0; + + return bus_poll(bus, false, timeout_usec); +} + +_public_ int sd_bus_flush(sd_bus *bus) { int r; - if (!bus) - return -EINVAL; - if (bus->fd < 0) - return -ENOTCONN; + assert_return(bus, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); - if (bus->state == BUS_RUNNING && bus->wqueue_size <= 0) + if (bus->state == BUS_CLOSING) + return 0; + + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + + r = bus_ensure_running(bus); + if (r < 0) + return r; + + if (bus->wqueue_size <= 0) return 0; for (;;) { @@ -1389,44 +2376,50 @@ int sd_bus_flush(sd_bus *bus) { if (r < 0) return r; - if (bus->state == BUS_RUNNING && bus->wqueue_size <= 0) + if (bus->wqueue_size <= 0) return 0; - r = sd_bus_wait(bus, (uint64_t) -1); + r = bus_poll(bus, false, (uint64_t) -1); if (r < 0) return r; } } -int sd_bus_add_filter(sd_bus *bus, sd_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 = new(struct filter_callback, 1); + f = new0(struct filter_callback, 1); if (!f) return -ENOMEM; f->callback = callback; f->userdata = userdata; - LIST_PREPEND(struct filter_callback, callbacks, bus->filter_callbacks, f); + bus->filter_callbacks_modified = true; + LIST_PREPEND(callbacks, bus->filter_callbacks, f); return 0; } -int sd_bus_remove_filter(sd_bus *bus, sd_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) { - LIST_REMOVE(struct filter_callback, callbacks, bus->filter_callbacks, f); + bus->filter_callbacks_modified = true; + LIST_REMOVE(callbacks, bus->filter_callbacks, f); free(f); return 1; } @@ -1434,3 +2427,388 @@ int sd_bus_remove_filter(sd_bus *bus, sd_message_handler_t callback, void *userd return 0; } + +_public_ int sd_bus_add_match(sd_bus *bus, + const char *match, + sd_bus_message_handler_t callback, + void *userdata) { + + struct bus_match_component *components = NULL; + unsigned n_components = 0; + uint64_t cookie = 0; + int r = 0; + + assert_return(bus, -EINVAL); + assert_return(match, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + r = bus_match_parse(match, &components, &n_components); + if (r < 0) + goto finish; + + if (bus->bus_client) { + cookie = ++bus->match_cookie; + + r = bus_add_match_internal(bus, match, components, n_components, cookie); + if (r < 0) + goto finish; + } + + bus->match_callbacks_modified = true; + r = bus_match_add(&bus->match_callbacks, components, n_components, callback, userdata, cookie, NULL); + if (r < 0) { + if (bus->bus_client) + bus_remove_match_internal(bus, match, cookie); + } + +finish: + bus_match_parse_free(components, n_components); + return r; +} + +_public_ int sd_bus_remove_match(sd_bus *bus, + const char *match, + sd_bus_message_handler_t callback, + void *userdata) { + + struct bus_match_component *components = NULL; + unsigned n_components = 0; + int r = 0, q = 0; + uint64_t cookie = 0; + + assert_return(bus, -EINVAL); + assert_return(match, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + r = bus_match_parse(match, &components, &n_components); + if (r < 0) + return r; + + bus->match_callbacks_modified = true; + r = bus_match_remove(&bus->match_callbacks, components, n_components, callback, userdata, &cookie); + + if (bus->bus_client) + q = bus_remove_match_internal(bus, match, cookie); + + bus_match_parse_free(components, n_components); + + return r < 0 ? r : q; +} + +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. */ + + return bus->original_pid != getpid(); +} + +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; +} + +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; +} + +static int prepare_callback(sd_event_source *s, void *userdata) { + sd_bus *bus = userdata; + int r, e; + usec_t until; + + assert(s); + assert(bus); + + 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; + } + + r = sd_bus_get_timeout(bus, &until); + if (r < 0) + return r; + if (r > 0) { + int j; + + j = sd_event_source_set_time(bus->time_event_source, until); + if (j < 0) + return j; + } + + r = sd_event_source_set_enabled(bus->time_event_source, r > 0); + if (r < 0) + return r; + + return 1; +} + +static int quit_callback(sd_event_source *event, void *userdata) { + sd_bus *bus = userdata; + + assert(event); + + sd_bus_flush(bus); + + return 1; +} + +_public_ int sd_bus_attach_event(sd_bus *bus, sd_event *event, int priority) { + int r; + + 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); + + if (event) + bus->event = sd_event_ref(event); + else { + r = sd_event_default(&bus->event); + if (r < 0) + return r; + } + + r = sd_event_add_io(bus->event, bus->input_fd, 0, io_callback, bus, &bus->input_io_event_source); + if (r < 0) + goto fail; + + r = sd_event_source_set_priority(bus->input_io_event_source, priority); + if (r < 0) + goto fail; + + if (bus->output_fd != bus->input_fd) { + r = sd_event_add_io(bus->event, bus->output_fd, 0, io_callback, bus, &bus->output_io_event_source); + if (r < 0) + goto fail; + + r = sd_event_source_set_priority(bus->output_io_event_source, priority); + if (r < 0) + goto fail; + } + + r = sd_event_source_set_prepare(bus->input_io_event_source, prepare_callback); + if (r < 0) + goto fail; + + r = sd_event_add_monotonic(bus->event, 0, 0, time_callback, bus, &bus->time_event_source); + if (r < 0) + goto fail; + + r = sd_event_source_set_priority(bus->time_event_source, priority); + if (r < 0) + goto fail; + + r = sd_event_add_quit(bus->event, quit_callback, bus, &bus->quit_event_source); + if (r < 0) + goto fail; + + return 0; + +fail: + sd_bus_detach_event(bus); + return r; +} + +_public_ int sd_bus_detach_event(sd_bus *bus) { + assert_return(bus, -EINVAL); + assert_return(bus->event, -ENXIO); + + 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); + } + + 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); + } + + 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); + } + + if (bus->event) + bus->event = sd_event_unref(bus->event); + + return 0; +} + +_public_ sd_event* sd_bus_get_event(sd_bus *bus) { + assert_return(bus, NULL); + + 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; + + assert(bus_open); + assert(default_bus); + + if (!ret) + return !!*default_bus; + + if (*default_bus) { + *ret = sd_bus_ref(*default_bus); + return 0; + } + + r = bus_open(&b); + if (r < 0) + return r; + + b->default_bus_ptr = default_bus; + b->tid = gettid(); + *default_bus = b; + + *ret = b; + return 1; +} + +_public_ int sd_bus_default_system(sd_bus **ret) { + static __thread sd_bus *default_system_bus = NULL; + + return bus_default(sd_bus_open_system, &default_system_bus, ret); +} + +_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); +} + +_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; + } + + 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; +}