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=5135253e6bef9fe91d334732352bc75ac885ec61;hp=df4010265f4aec97ecbadaa0a6553137f834b73d;hb=486e950bd91092a3b1be73f54c901c6c28cab0a2;hpb=021a1e78d7621bcd844a9bf22efca88960a8e28b diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index df4010265..5135253e6 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -26,32 +26,96 @@ #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" 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(struct node_callback, callbacks, n->callbacks, c); + free(c); + } + + while ((v = n->vtables)) { + LIST_REMOVE(struct node_vtable, vtables, n->vtables, v); + free(v->interface); + free(v); + } + + while ((e = n->enumerators)) { + LIST_REMOVE(struct node_enumerator, enumerators, n->enumerators, e); + free(e); + } + + if (n->parent) + LIST_REMOVE(struct node, siblings, n->parent->child, n); + + assert_se(hashmap_remove(b->nodes, n->path) == n); + free(n->path); + free(n); +} + static void bus_free(sd_bus *b) { struct filter_callback *f; - struct object_callback *c; + struct node *n; unsigned i; assert(b); - if (b->fd >= 0) - close_nointr_nofail(b->fd); + 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_uid); + free(b->auth_buffer); free(b->address); + free(b->kernel); + + free(b->exec_path); + strv_free(b->exec_argv); close_many(b->fds, b->n_fds); free(b->fds); @@ -72,12 +136,19 @@ static void bus_free(sd_bus *b) { free(f); } - while ((c = hashmap_steal_first(b->object_callbacks))) { - free(c->path); - free(c); - } + 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->object_callbacks); + hashmap_free(b->nodes); + + bus_kernel_flush_memfd(b); + + assert_se(pthread_mutex_destroy(&b->memfd_cache_mutex) == 0); free(b); } @@ -92,10 +163,13 @@ int sd_bus_new(sd_bus **ret) { if (!r) 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->negotiate_fds = true; + 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 */ @@ -118,6 +192,8 @@ int sd_bus_set_address(sd_bus *bus, const char *address) { return -EPERM; if (!address) return -EINVAL; + if (bus_pid_changed(bus)) + return -ECHILD; a = strdup(address); if (!a) @@ -129,50 +205,203 @@ int sd_bus_set_address(sd_bus *bus, const char *address) { return 0; } -int sd_bus_set_fd(sd_bus *bus, int fd) { +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; + if (bus_pid_changed(bus)) + return -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[]) { + char *p, **a; + + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + if (!path) + return -EINVAL; + if (strv_isempty(argv)) + return -EINVAL; + if (bus_pid_changed(bus)) + return -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; +} + +int sd_bus_set_bus_client(sd_bus *bus, int b) { + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + if (bus_pid_changed(bus)) + return -ECHILD; + + bus->bus_client = !!b; + return 0; +} + +int sd_bus_negotiate_fds(sd_bus *bus, int b) { + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + if (bus_pid_changed(bus)) + return -ECHILD; + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ACCEPT_FD, b); + return 0; +} + +int sd_bus_negotiate_attach_comm(sd_bus *bus, int b) { + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + if (bus_pid_changed(bus)) + return -ECHILD; + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_COMM, b); + return 0; +} + +int sd_bus_negotiate_attach_exe(sd_bus *bus, int b) { + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + if (bus_pid_changed(bus)) + return -ECHILD; + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_EXE, b); + return 0; +} + +int sd_bus_negotiate_attach_cmdline(sd_bus *bus, int b) { + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + if (bus_pid_changed(bus)) + return -ECHILD; + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CMDLINE, b); + return 0; +} + +int sd_bus_negotiate_attach_cgroup(sd_bus *bus, int b) { + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + if (bus_pid_changed(bus)) + return -ECHILD; + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CGROUP, b); + return 0; +} + +int sd_bus_negotiate_attach_caps(sd_bus *bus, int b) { + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + if (bus_pid_changed(bus)) + return -ECHILD; + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_CAPS, b); + return 0; +} + +int sd_bus_negotiate_attach_selinux_context(sd_bus *bus, int b) { if (!bus) return -EINVAL; if (bus->state != BUS_UNSET) return -EPERM; - if (fd < 0) + if (bus_pid_changed(bus)) + return -ECHILD; + + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_SECLABEL, b); + return 0; +} + +int sd_bus_negotiate_attach_audit(sd_bus *bus, int b) { + if (!bus) return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + if (bus_pid_changed(bus)) + return -ECHILD; - bus->fd = fd; + SET_FLAG(bus->hello_flags, KDBUS_HELLO_ATTACH_AUDIT, b); return 0; } -int sd_bus_set_hello(sd_bus *bus, int b) { +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; + if (bus_pid_changed(bus)) + return -ECHILD; - bus->send_hello = !!b; + bus->is_server = !!b; + bus->server_id = server_id; return 0; } -int sd_bus_set_negotiate_fds(sd_bus *bus, int b) { +int sd_bus_set_anonymous(sd_bus *bus, int b) { if (!bus) return -EINVAL; if (bus->state != BUS_UNSET) return -EPERM; + if (bus_pid_changed(bus)) + return -ECHILD; - bus->negotiate_fds = !!b; + bus->anonymous_auth = !!b; return 0; } -static int hello_callback(sd_bus *bus, int error, sd_bus_message *reply, void *userdata) { +static int hello_callback(sd_bus *bus, sd_bus_message *reply, void *userdata) { const char *s; int r; assert(bus); assert(bus->state == BUS_HELLO); - - if (error != 0) - return -error; - assert(reply); + r = bus_message_to_errno(reply); + if (r < 0) + return r; + r = sd_bus_message_read(reply, "s", &s); if (r < 0) return r; @@ -195,7 +424,7 @@ static int bus_send_hello(sd_bus *bus) { assert(bus); - if (!bus->send_hello) + if (!bus->bus_client || bus->is_kernel) return 0; r = sd_bus_message_new_method_call( @@ -208,17 +437,13 @@ static int bus_send_hello(sd_bus *bus) { if (r < 0) return r; - r = sd_bus_send_with_reply(bus, m, hello_callback, NULL, 0, NULL); - if (r < 0) - return r; - - return r; + return sd_bus_send_with_reply(bus, m, hello_callback, NULL, 0, &bus->hello_serial); } -static int bus_start_running(sd_bus *bus) { +int bus_start_running(sd_bus *bus) { assert(bus); - if (bus->send_hello) { + if (bus->bus_client && !bus->is_kernel) { bus->state = BUS_HELLO; return 1; } @@ -234,21 +459,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; - while (*a != ',' && *a != 0) { + a = *p + l + 1; + } else + a = *p; + + while (*a != ';' && *a != ',' && *a != 0) { char c, *t; if (*a == '%') { @@ -294,7 +522,10 @@ static int parse_address_key(const char **p, const char *key, char **value) { a++; *p = a; + + free(*value); *value = r; + return 1; } @@ -308,433 +539,431 @@ static void skip_address_key(const char **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; - - a = b->address + b->address_index; + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + 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, "path", &path); + if (r < 0) + return r; + else if (r > 0) + continue; - if (startswith(a, "unix:")) { - _cleanup_free_ char *path = NULL, *abstract = NULL; + r = parse_address_key(p, "abstract", &abstract); + if (r < 0) + return r; + else if (r > 0) + continue; - p = a + 5; - while (*p != 0) { - r = parse_address_key(&p, "guid", &guid); - if (r < 0) - return r; - else if (r > 0) - continue; + skip_address_key(p); + } - 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 && abstract) + return -EINVAL; - skip_address_key(&p); - } + if (path) { + l = strlen(path); + if (l > sizeof(b->sockaddr.un.sun_path)) + return -E2BIG; - if (!path && !abstract) - return -EINVAL; + 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; - if (path && abstract) - return -EINVAL; + 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; + } - if (path) { - size_t l; + return 0; +} - l = strlen(path); - if (l > sizeof(b->sockaddr.un.sun_path)) - return -E2BIG; +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, + }; - 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; + assert(b); + assert(p); + assert(*p); + assert(guid); - l = strlen(abstract); - if (l > sizeof(b->sockaddr.un.sun_path) - 1) - return -E2BIG; + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + 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, abstract, sizeof(b->sockaddr.un.sun_path)-1); - b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + 1 + l; - } + r = parse_address_key(p, "host", &host); + if (r < 0) + return r; + else if (r > 0) + continue; - } else if (startswith(a, "tcp:")) { - _cleanup_free_ char *host = NULL, *port = NULL, *family = NULL; - struct addrinfo hints, *result; + r = parse_address_key(p, "port", &port); + if (r < 0) + return r; + else if (r > 0) + continue; - p = a + 4; - while (*p != 0) { - r = parse_address_key(&p, "guid", &guid); - if (r < 0) - return r; - else if (r > 0) - continue; + r = parse_address_key(p, "family", &family); + if (r < 0) + return r; + else if (r > 0) + continue; - r = parse_address_key(&p, "host", &host); - if (r < 0) - return r; - else if (r > 0) - continue; + skip_address_key(p); + } - r = parse_address_key(&p, "port", &port); - if (r < 0) - return r; - else if (r > 0) - continue; + if (!host || !port) + return -EINVAL; - r = parse_address_key(&p, "family", &family); - 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; + } - skip_address_key(&p); - } + r = getaddrinfo(host, port, &hints, &result); + if (r == EAI_SYSTEM) + return -errno; + else if (r != 0) + return -EADDRNOTAVAIL; - if (!host || !port) - return -EINVAL; + memcpy(&b->sockaddr, result->ai_addr, result->ai_addrlen); + b->sockaddr_size = result->ai_addrlen; - zero(hints); - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_ADDRCONFIG; + freeaddrinfo(result); - if (family) { - if (streq(family, "ipv4")) - hints.ai_family = AF_INET; - else if (streq(family, "ipv6")) - hints.ai_family = AF_INET6; - else - return -EINVAL; - } + return 0; +} - r = getaddrinfo(host, port, &hints, &result); - if (r == EAI_SYSTEM) - return -errno; - else if (r != 0) - return -EADDRNOTAVAIL; +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; - memcpy(&b->sockaddr, result->ai_addr, result->ai_addrlen); - b->sockaddr_size = result->ai_addrlen; + assert(b); + assert(p); + assert(*p); + assert(guid); - freeaddrinfo(result); - } + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + goto fail; + else if (r > 0) + continue; - if (guid) { - r = sd_id128_from_string(guid, &b->peer); + r = parse_address_key(p, "path", &path); if (r < 0) - return r; - } + goto fail; + else if (r > 0) + continue; - b->address_index = p - b->address; - return 1; -} + if (startswith(*p, "argv")) { + unsigned ul; -static void iovec_advance(struct iovec *iov, unsigned *idx, size_t size) { + errno = 0; + ul = strtoul(*p + 4, (char**) p, 10); + if (errno > 0 || **p != '=' || ul > 256) { + r = -EINVAL; + goto fail; + } - while (size > 0) { - struct iovec *i = iov + *idx; + (*p) ++; - if (i->iov_len > size) { - i->iov_base = (uint8_t*) i->iov_base + size; - i->iov_len -= size; - return; - } + if (ul >= n_argv) { + char **x; - size -= i->iov_len; + x = realloc(argv, sizeof(char*) * (ul + 2)); + if (!x) { + r = -ENOMEM; + goto fail; + } - i->iov_base = NULL; - i->iov_len = 0; + memset(x + n_argv, 0, sizeof(char*) * (ul - n_argv + 2)); - (*idx) ++; - } -} + argv = x; + n_argv = ul + 1; + } -static int bus_write_auth(sd_bus *b) { - struct msghdr mh; - ssize_t k; + r = parse_address_key(p, NULL, argv + ul); + if (r < 0) + goto fail; - assert(b); - assert(b->state == BUS_AUTHENTICATING); + continue; + } - if (b->auth_index >= ELEMENTSOF(b->auth_iovec)) - return 0; + skip_address_key(p); + } - if (b->auth_timeout == 0) - b->auth_timeout = now(CLOCK_MONOTONIC) + BUS_DEFAULT_TIMEOUT; + if (!path) { + 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; + /* 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; + } - k = sendmsg(b->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL); - if (k < 0) - return errno == EAGAIN ? 0 : -errno; + if (argv && argv[0] == NULL) { + argv[0] = strdup(path); + if (!argv[0]) { + r = -ENOMEM; + goto fail; + } + } - iovec_advance(b->auth_iovec, &b->auth_index, (size_t) k); + b->exec_path = path; + b->exec_argv = argv; + return 0; - return 1; +fail: + for (j = 0; j < n_argv; j++) + free(argv[j]); + + free(argv); + free(path); + return r; } -static int bus_auth_verify(sd_bus *b) { - char *e, *f, *start; - 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" and possibly - * "AGREE_UNIX_FD" */ - - e = memmem(b->rbuffer, b->rbuffer_size, "\r\n", 2); - if (!e) - return 0; - - if (b->negotiate_fds) { - f = memmem(e + 2, b->rbuffer_size - (e - (char*) b->rbuffer) - 2, "\r\n", 2); - if (!f) - return 0; - - start = f + 2; - } else { - f = NULL; - start = e + 2; - } - - /* Nice! We got all the lines we need. First check the OK - * line */ - - if (e - (char*) b->rbuffer != 3 + 32) - return -EPERM; - - if (memcmp(b->rbuffer, "OK ", 3)) - return -EPERM; - - for (i = 0; i < 32; i += 2) { - int x, y; + assert(b); + assert(p); + assert(*p); + assert(guid); - x = unhexchar(((char*) b->rbuffer)[3 + i]); - y = unhexchar(((char*) b->rbuffer)[3 + i + 1]); + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + return r; + else if (r > 0) + continue; - if (x < 0 || y < 0) - return -EINVAL; + r = parse_address_key(p, "path", &path); + 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; - - b->peer = peer; - - /* And possibly check the second line, too */ + if (!path) + return -EINVAL; - if (f) - b->can_fds = - (f - e == sizeof("\r\nAGREE_UNIX_FD") - 1) && - memcmp(e + 2, "AGREE_UNIX_FD", sizeof("AGREE_UNIX_FD") - 1) == 0; + free(b->kernel); + b->kernel = path; + path = NULL; - b->rbuffer_size -= (start - (char*) b->rbuffer); - memmove(b->rbuffer, start, 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; } -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; - void *p; assert(b); - r = bus_auth_verify(b); - if (r != 0) - return r; - - n = MAX(3 + 32 + 2 + sizeof("AGREE_UNIX_FD") - 1 + 2, b->rbuffer_size * 2); - - if (n > BUS_AUTH_SIZE_MAX) - n = BUS_AUTH_SIZE_MAX; - - if (b->rbuffer_size >= n) - return -ENOBUFS; - - p = realloc(b->rbuffer, n); - if (!p) - return -ENOMEM; - - b->rbuffer = p; - - zero(iov); - iov.iov_base = (uint8_t*) b->rbuffer + b->rbuffer_size; - iov.iov_len = n - b->rbuffer_size; - - zero(mh); - mh.msg_iov = &iov; - mh.msg_iovlen = 1; + if (!b->address) + return 0; + if (b->address[b->address_index] == 0) + return 0; - k = recvmsg(b->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL); - if (k < 0) - return errno == EAGAIN ? 0 : -errno; - if (k == 0) - return -ECONNRESET; + bus_reset_parsed_address(b); - b->rbuffer_size += k; + a = b->address + b->address_index; - r = bus_auth_verify(b); - if (r != 0) - return r; + while (*a != 0) { - return 1; -} + if (*a == ';') { + a++; + continue; + } -static int bus_setup_fd(sd_bus *b) { - int one; + if (startswith(a, "unix:")) { + a += 5; - assert(b); + r = parse_unix_address(b, &a, &guid); + if (r < 0) + return r; + break; - /* Enable SO_PASSCRED + SO_PASSEC. We try this on any socket, - * just in case. This is actually irrelavant for */ - one = 1; - setsockopt(b->fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)); - setsockopt(b->fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one)); + } else if (startswith(a, "tcp:")) { - /* Increase the buffers to a MB */ - fd_inc_rcvbuf(b->fd, 1024*1024); - fd_inc_sndbuf(b->fd, 1024*1024); + a += 4; + r = parse_tcp_address(b, &a, &guid); + if (r < 0) + return r; - return 0; -} + break; -static int bus_start_auth(sd_bus *b) { - static const char auth_prefix[] = "\0AUTH EXTERNAL "; - static const char auth_suffix_with_unix_fd[] = "\r\nNEGOTIATE_UNIX_FD\r\nBEGIN\r\n"; - static const char auth_suffix_without_unix_fd[] = "\r\nBEGIN\r\n"; + } else if (startswith(a, "unixexec:")) { - char text[20 + 1]; /* enough space for a 64bit integer plus NUL */ - size_t l; - const char *auth_suffix; + a += 9; + r = parse_exec_address(b, &a, &guid); + if (r < 0) + return r; - assert(b); + break; - b->state = BUS_AUTHENTICATING; + } else if (startswith(a, "kernel:")) { - snprintf(text, sizeof(text), "%llu", (unsigned long long) geteuid()); - char_array_0(text); + a += 7; + r = parse_kernel_address(b, &a, &guid); + if (r < 0) + return r; - l = strlen(text); - b->auth_uid = hexmem(text, l); - if (!b->auth_uid) - return -ENOMEM; + break; + } - auth_suffix = b->negotiate_fds ? auth_suffix_with_unix_fd : auth_suffix_without_unix_fd; + a = strchr(a, ';'); + if (!a) + return 0; + } - 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 = strlen(auth_suffix); - b->auth_size = sizeof(auth_prefix) - 1 + l * 2 + sizeof(auth_suffix) - 1; + 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) - return r; - if (r == 0) - return b->last_connect_error ? -b->last_connect_error : -ECONNREFUSED; - } + sd_bus_close(b); - b->fd = socket(b->sockaddr.sa.sa_family, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); - if (b->fd < 0) { - b->last_connect_error = errno; - goto try_again; - } + if (b->sockaddr.sa.sa_family != AF_UNSPEC) { - r = bus_setup_fd(b); - if (r < 0) { - b->last_connect_error = errno; - goto try_again; - } + r = bus_socket_connect(b); + if (r >= 0) + return r; - r = connect(b->fd, &b->sockaddr.sa, b->sockaddr_size); - if (r < 0) { - if (errno == EINPROGRESS) - return 1; + b->last_connect_error = -r; - b->last_connect_error = errno; - goto try_again; - } + } else if (b->exec_path) { + + r = bus_socket_exec(b); + if (r >= 0) + return r; - return bus_start_auth(b); + b->last_connect_error = -r; + } else if (b->kernel) { - try_again: - zero(b->sockaddr); + r = bus_kernel_connect(b); + if (r >= 0) + return r; - if (b->fd >= 0) { - close_nointr_nofail(b->fd); - b->fd = -1; + b->last_connect_error = -r; } + + 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 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; assert(b); + assert(b->input_fd >= 0); + assert(b->output_fd >= 0); - r = fd_nonblock(b->fd, true); + r = fd_nonblock(b->input_fd, true); if (r < 0) return r; - r = fd_cloexec(b->fd, true); + r = fd_cloexec(b->input_fd, true); if (r < 0) return r; - r = bus_setup_fd(b); - if (r < 0) - return r; + if (b->input_fd != b->output_fd) { + r = fd_nonblock(b->output_fd, true); + if (r < 0) + return r; + + r = fd_cloexec(b->output_fd, true); + if (r < 0) + return r; + } + + if (fstat(b->input_fd, &st) < 0) + return -errno; - return bus_start_auth(b); + if (S_ISCHR(b->input_fd)) + return bus_kernel_take_fd(b); + else + return bus_socket_take_fd(b); } int sd_bus_start(sd_bus *bus) { @@ -744,13 +973,18 @@ int sd_bus_start(sd_bus *bus) { return -EINVAL; if (bus->state != BUS_UNSET) return -EPERM; + if (bus_pid_changed(bus)) + return -ECHILD; bus->state = BUS_OPENING; - if (bus->fd >= 0) + if (bus->is_server && bus->bus_client) + return -EINVAL; + + if (bus->input_fd >= 0) r = bus_start_fd(bus); - else if (bus->address) - r = bus_start_connect(bus); + else if (bus->address || bus->sockaddr.sa.sa_family != AF_UNSPEC || bus->exec_path || bus->kernel) + r = bus_start_address(bus); else return -EINVAL; @@ -772,7 +1006,7 @@ int sd_bus_open_system(sd_bus **ret) { if (r < 0) return r; - e = getenv("DBUS_SYSTEM_BUS_ADDRESS"); + e = secure_getenv("DBUS_SYSTEM_BUS_ADDRESS"); if (e) { r = sd_bus_set_address(b, e); if (r < 0) @@ -783,7 +1017,7 @@ int sd_bus_open_system(sd_bus **ret) { b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + sizeof("/run/dbus/system_bus_socket") - 1; } - b->send_hello = true; + b->bus_client = true; r = sd_bus_start(b); if (r < 0) @@ -810,13 +1044,13 @@ int sd_bus_open_user(sd_bus **ret) { 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"); + e = secure_getenv("XDG_RUNTIME_DIR"); if (!e) { r = -ENOENT; goto fail; @@ -833,7 +1067,7 @@ int sd_bus_open_user(sd_bus **ret) { b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + l + 4; } - b->send_hello = true; + b->bus_client = true; r = sd_bus_start(b); if (r < 0) @@ -850,20 +1084,29 @@ fail: 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; + + bus->state = BUS_CLOSED; - close_nointr_nofail(bus->fd); - bus->fd = -1; + 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; - assert(bus->n_ref > 0); + assert_se(REFCNT_INC(bus->n_ref) >= 2); - bus->n_ref++; return bus; } @@ -871,10 +1114,7 @@ sd_bus *sd_bus_unref(sd_bus *bus) { if (!bus) return NULL; - assert(bus->n_ref > 0); - bus->n_ref--; - - if (bus->n_ref <= 0) + if (REFCNT_DEC(bus->n_ref) <= 0) bus_free(bus); return NULL; @@ -883,8 +1123,10 @@ sd_bus *sd_bus_unref(sd_bus *bus) { int sd_bus_is_open(sd_bus *bus) { if (!bus) return -EINVAL; + if (bus_pid_changed(bus)) + return -ECHILD; - return bus->state != BUS_UNSET && bus->fd >= 0; + return BUS_IS_OPEN(bus->state); } int sd_bus_can_send(sd_bus *bus, char type) { @@ -892,11 +1134,13 @@ int sd_bus_can_send(sd_bus *bus, char type) { if (!bus) return -EINVAL; - if (bus->fd < 0) + if (bus->state == BUS_UNSET) return -ENOTCONN; + if (bus_pid_changed(bus)) + return -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); @@ -909,19 +1153,21 @@ int sd_bus_can_send(sd_bus *bus, char type) { return bus_type_is_valid(type); } -int sd_bus_get_peer(sd_bus *bus, sd_id128_t *peer) { +int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) { int r; if (!bus) return -EINVAL; - if (!peer) + if (!server_id) return -EINVAL; + if (bus_pid_changed(bus)) + return -ECHILD; r = bus_ensure_running(bus); if (r < 0) return r; - *peer = bus->peer; + *server_id = bus->server_id; return 0; } @@ -937,253 +1183,26 @@ static int bus_seal_message(sd_bus *b, sd_bus_message *m) { 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); - assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - - if (*idx >= m->size) - return 0; - zero(mh); - - if (m->n_fds > 0) { - struct cmsghdr *control; - control = alloca(CMSG_SPACE(sizeof(int) * m->n_fds)); - - mh.msg_control = control; - control->cmsg_level = SOL_SOCKET; - control->cmsg_type = SCM_RIGHTS; - mh.msg_controllen = control->cmsg_len = CMSG_LEN(sizeof(int) * m->n_fds); - memcpy(CMSG_DATA(control), m->fds, sizeof(int) * m->n_fds); - } - - n = m->n_iovec * sizeof(struct iovec); - iov = alloca(n); - memcpy(iov, m->iovec, n); - - j = 0; - iovec_advance(iov, &j, *idx); - - mh.msg_iov = iov; - mh.msg_iovlen = m->n_iovec; - - k = sendmsg(bus->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL); - if (k < 0) - return errno == EAGAIN ? 0 : -errno; - - *idx += (size_t) k; - return 1; -} - -static int message_read_need(sd_bus *bus, size_t *need) { - uint32_t a, b; - uint8_t e; - uint64_t sum; - - assert(bus); - assert(need); - assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - - if (bus->rbuffer_size < sizeof(struct bus_header)) { - *need = sizeof(struct bus_header) + 8; - - /* Minimum message size: - * - * Header + - * - * Method Call: +2 string headers - * Signal: +3 string headers - * Method Error: +1 string headers - * +1 uint32 headers - * Method Reply: +1 uint32 headers - * - * A string header is at least 9 bytes - * A uint32 header is at least 8 bytes - * - * Hence the minimum message size of a valid message - * is header + 8 bytes */ - - return 0; - } - - a = ((const uint32_t*) bus->rbuffer)[1]; - b = ((const uint32_t*) bus->rbuffer)[3]; - - 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 -EBADMSG; - - sum = (uint64_t) sizeof(struct bus_header) + (uint64_t) ALIGN_TO(b, 8) + (uint64_t) a; - if (sum >= BUS_MESSAGE_SIZE_MAX) - return -ENOBUFS; - - *need = (size_t) sum; - return 0; -} - -static int message_make(sd_bus *bus, size_t size, sd_bus_message **m) { - sd_bus_message *t; - void *b; - int r; - - assert(bus); - assert(m); - assert(bus->rbuffer_size >= size); - assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - - if (bus->rbuffer_size > size) { - b = memdup((const uint8_t*) bus->rbuffer + size, - bus->rbuffer_size - size); - if (!b) - return -ENOMEM; - } else - b = NULL; - - r = bus_message_from_malloc(bus->rbuffer, size, - bus->fds, bus->n_fds, - bus->ucred_valid ? &bus->ucred : NULL, - bus->label[0] ? bus->label : NULL, - &t); - if (r < 0) { - free(b); - return r; - } - - bus->rbuffer = b; - bus->rbuffer_size -= size; - - bus->fds = NULL; - bus->n_fds = 0; - - *m = t; - return 1; -} - -static int message_read(sd_bus *bus, sd_bus_message **m) { - struct msghdr mh; - struct iovec iov; - ssize_t k; - size_t need; - int r; - void *b; - union { - struct cmsghdr cmsghdr; - uint8_t buf[CMSG_SPACE(sizeof(int) * BUS_FDS_MAX) + - CMSG_SPACE(sizeof(struct ucred)) + - CMSG_SPACE(NAME_MAX)]; /*selinux label */ - } control; - struct cmsghdr *cmsg; - - assert(bus); - assert(m); - assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - - 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; - - bus->rbuffer = b; - - 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; - mh.msg_control = &control; - mh.msg_controllen = sizeof(control); - - k = recvmsg(bus->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL|MSG_CMSG_CLOEXEC); - if (k < 0) - return errno == EAGAIN ? 0 : -errno; - if (k == 0) - return -ECONNRESET; - - bus->rbuffer_size += k; - - for (cmsg = CMSG_FIRSTHDR(&mh); cmsg; cmsg = CMSG_NXTHDR(&mh, cmsg)) { - if (cmsg->cmsg_level == SOL_SOCKET && - cmsg->cmsg_type == SCM_RIGHTS) { - int n, *f; - - n = (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int); - - f = realloc(bus->fds, sizeof(int) + (bus->n_fds + n)); - if (!f) { - close_many((int*) CMSG_DATA(cmsg), n); - return -ENOMEM; - } - - memcpy(f + bus->n_fds, CMSG_DATA(cmsg), n * sizeof(int)); - bus->fds = f; - bus->n_fds += n; - } else if (cmsg->cmsg_level == SOL_SOCKET && - cmsg->cmsg_type == SCM_CREDENTIALS && - cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred))) { - - memcpy(&bus->ucred, CMSG_DATA(cmsg), sizeof(struct ucred)); - bus->ucred_valid = true; - - } else if (cmsg->cmsg_level == SOL_SOCKET && - cmsg->cmsg_type == SCM_SECURITY) { - - size_t l; - l = cmsg->cmsg_len - CMSG_LEN(0); - memcpy(&bus->label, CMSG_DATA(cmsg), l); - bus->label[l] = 0; - } - } - - r = message_read_need(bus, &need); - if (r < 0) - return r; - - if (bus->rbuffer_size >= need) - return message_make(bus, need, m); - - return 1; -} - static int dispatch_wqueue(sd_bus *bus) { int r, ret = 0; assert(bus); assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - if (bus->fd < 0) - return -ENOTCONN; - while (bus->wqueue_size > 0) { - r = message_write(bus, bus->wqueue[0], &bus->windex); + 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); return r; } else if (r == 0) /* Didn't do anything this time */ return ret; - else if (bus->windex >= bus->wqueue[0]->size) { + else if (bus->is_kernel || bus->windex >= BUS_MESSAGE_SIZE(bus->wqueue[0])) { /* Fully written. Let's drop the entry from * the queue. * @@ -1214,9 +1233,6 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) { assert(m); assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - if (bus->fd < 0) - return -ENOTCONN; - if (bus->rqueue_size > 0) { /* Dispatch a queued message */ @@ -1228,7 +1244,11 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) { /* Try to read a new message */ do { - r = message_read(bus, &z); + if (bus->is_kernel) + r = bus_kernel_read_message(bus, &z); + else + r = bus_socket_read_message(bus, &z); + if (r < 0) { sd_bus_close(bus); return r; @@ -1236,11 +1256,11 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) { if (r == 0) return ret; - r = 1; + ret = 1; } while (!z); *m = z; - return 1; + return ret; } int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { @@ -1248,12 +1268,12 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { if (!bus) return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->fd < 0) + if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; if (!m) return -EINVAL; + if (bus_pid_changed(bus)) + return -ECHILD; if (m->n_fds > 0) { r = sd_bus_can_send(bus, SD_BUS_TYPE_UNIX_FD); @@ -1280,11 +1300,15 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { if ((bus->state == BUS_RUNNING || bus->state == BUS_HELLO) && bus->wqueue_size <= 0) { size_t idx = 0; - r = message_write(bus, m, &idx); + if (bus->is_kernel) + r = bus_kernel_write_message(bus, m); + else + r = bus_socket_write_message(bus, m, &idx); + if (r < 0) { sd_bus_close(bus); return r; - } else if (idx < m->size) { + } 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 @@ -1347,7 +1371,7 @@ static int timeout_compare(const void *a, const void *b) { int sd_bus_send_with_reply( 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) { @@ -1357,9 +1381,7 @@ int sd_bus_send_with_reply( if (!bus) return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->fd < 0) + if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; if (!m) return -EINVAL; @@ -1369,6 +1391,8 @@ int sd_bus_send_with_reply( return -EINVAL; if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) return -EINVAL; + if (bus_pid_changed(bus)) + return -ECHILD; r = hashmap_ensure_allocated(&bus->reply_callbacks, uint64_hash_func, uint64_compare_func); if (r < 0) @@ -1384,7 +1408,7 @@ int sd_bus_send_with_reply( if (r < 0) return r; - c = new(struct reply_callback, 1); + c = new0(struct reply_callback, 1); if (!c) return -ENOMEM; @@ -1424,6 +1448,8 @@ int sd_bus_send_with_reply_cancel(sd_bus *bus, uint64_t serial) { return -EINVAL; if (serial == 0) return -EINVAL; + if (bus_pid_changed(bus)) + return -ECHILD; c = hashmap_remove(bus->reply_callbacks, &serial); if (!c) @@ -1441,11 +1467,8 @@ int bus_ensure_running(sd_bus *bus) { assert(bus); - if (bus->fd < 0) + if (bus->state == BUS_UNSET || bus->state == BUS_CLOSED) return -ENOTCONN; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->state == BUS_RUNNING) return 1; @@ -1478,9 +1501,7 @@ int sd_bus_send_with_reply_and_block( if (!bus) return -EINVAL; - if (bus->fd < 0) - return -ENOTCONN; - if (bus->state == BUS_UNSET) + if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; if (!m) return -EINVAL; @@ -1490,6 +1511,8 @@ int sd_bus_send_with_reply_and_block( return -EINVAL; if (bus_error_is_dirty(error)) return -EINVAL; + if (bus_pid_changed(bus)) + return -ECHILD; r = bus_ensure_running(bus); if (r < 0) @@ -1522,7 +1545,10 @@ int sd_bus_send_with_reply_and_block( room = true; } - r = message_read(bus, &incoming); + 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) { @@ -1531,7 +1557,12 @@ int sd_bus_send_with_reply_and_block( /* Found a match! */ if (incoming->header->type == SD_BUS_MESSAGE_TYPE_METHOD_RETURN) { - *reply = incoming; + + if (reply) + *reply = incoming; + else + sd_bus_message_unref(incoming); + return 0; } @@ -1588,11 +1619,14 @@ int sd_bus_send_with_reply_and_block( int sd_bus_get_fd(sd_bus *bus) { if (!bus) return -EINVAL; - - if (bus->fd < 0) + if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; + if (bus->input_fd != bus->output_fd) + return -EPERM; + if (bus_pid_changed(bus)) + return -ECHILD; - return bus->fd; + return bus->input_fd; } int sd_bus_get_events(sd_bus *bus) { @@ -1600,16 +1634,16 @@ int sd_bus_get_events(sd_bus *bus) { if (!bus) return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->fd < 0) + if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; + if (bus_pid_changed(bus)) + return -ECHILD; if (bus->state == BUS_OPENING) flags |= POLLOUT; else if (bus->state == BUS_AUTHENTICATING) { - if (bus->auth_index < ELEMENTSOF(bus->auth_iovec)) + if (bus_socket_auth_needs_write(bus)) flags |= POLLOUT; flags |= POLLIN; @@ -1631,28 +1665,33 @@ int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) { return -EINVAL; if (!timeout_usec) return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->fd < 0) + if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; + if (bus_pid_changed(bus)) + return -ECHILD; if (bus->state == BUS_AUTHENTICATING) { *timeout_usec = bus->auth_timeout; return 1; } - if (bus->state != BUS_RUNNING && bus->state != BUS_HELLO) + if (bus->state != BUS_RUNNING && bus->state != BUS_HELLO) { + *timeout_usec = (uint64_t) -1; return 0; + } c = prioq_peek(bus->reply_callbacks_prioq); - if (!c) + if (!c) { + *timeout_usec = (uint64_t) -1; return 0; + } *timeout_usec = c->timeout; return 1; } static int process_timeout(sd_bus *bus) { + _cleanup_bus_message_unref_ sd_bus_message* m = NULL; struct reply_callback *c; usec_t n; int r; @@ -1667,15 +1706,45 @@ 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("org.freedesktop.DBus.Error.Timeout", "Timed out"), + &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); + r = c->callback(bus, m, c->userdata); free(c); return r < 0 ? r : 1; } +static int process_hello(sd_bus *bus, sd_bus_message *m) { + assert(bus); + assert(m); + + 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_TYPE_METHOD_RETURN && + m->header->type != SD_BUS_MESSAGE_TYPE_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) { struct reply_callback *c; int r; @@ -1694,7 +1763,11 @@ 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); free(c); return r; @@ -1704,11 +1777,52 @@ static int process_filter(sd_bus *bus, sd_bus_message *m) { struct filter_callback *l; int r; - LIST_FOREACH(callbacks, l, bus->filter_callbacks) { - r = l->callback(bus, 0, m, l->userdata); + assert(bus); + assert(m); + + do { + bus->filter_callbacks_modified = false; + + LIST_FOREACH(callbacks, l, bus->filter_callbacks) { + + 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); + if (r != 0) + return r; + + } + + } 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; } @@ -1745,13 +1859,10 @@ static int process_builtin(sd_bus *bus, sd_bus_message *m) { 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_INIT; - - sd_bus_error_set(&error, - "org.freedesktop.DBus.Error.UnknownMethod", + r = sd_bus_message_new_method_errorf( + bus, m, &reply, + "org.freedesktop.DBus.Error.UnknownMethod", "Unknown method '%s' on interface '%s'.", m->member, m->interface); - - r = sd_bus_message_new_method_error(bus, m, &error, &reply); } if (r < 0) @@ -1764,426 +1875,2397 @@ 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_INIT; - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - struct object_callback *c; - char *p; +static int node_vtable_get_userdata( + sd_bus *bus, + const char *path, + struct node_vtable *c, + void **userdata) { + + void *u; int r; - bool found = false; assert(bus); - assert(m); - - if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) - return 0; + assert(path); + assert(c); - if (hashmap_isempty(bus->object_callbacks)) - return 0; - - c = hashmap_get(bus->object_callbacks, m->path); - if (c) { - r = c->callback(bus, 0, m, c->userdata); - if (r != 0) + u = c->userdata; + if (c->find) { + r = c->find(bus, path, c->interface, &u, u); + if (r <= 0) return r; - - found = true; } - /* Look for fallback prefixes */ - p = strdupa(m->path); - for (;;) { - char *e; - - e = strrchr(p, '/'); - if (e == p || !e) - break; + if (userdata) + *userdata = u; - *e = 0; + return 1; +} - c = hashmap_get(bus->object_callbacks, p); - if (c && c->is_fallback) { - r = c->callback(bus, 0, m, c->userdata); - if (r != 0) - return r; +static void *vtable_property_convert_userdata(const sd_bus_vtable *p, void *u) { + assert(p); - found = true; - } - } + return (uint8_t*) u + p->property.offset; +} - if (!found) - return 0; +static int vtable_property_get_userdata( + sd_bus *bus, + const char *path, + struct vtable_member *p, + void **userdata) { - sd_bus_error_set(&error, - "org.freedesktop.DBus.Error.UnknownMethod", - "Unknown method '%s' or interface '%s'.", m->member, m->interface); + void *u; + int r; - r = sd_bus_message_new_method_error(bus, m, &error, &reply); - if (r < 0) - return r; + assert(bus); + assert(path); + assert(p); + assert(userdata); - r = sd_bus_send(bus, reply, NULL); - if (r < 0) + r = node_vtable_get_userdata(bus, path, p->parent, &u); + if (r <= 0) return r; + *userdata = vtable_property_convert_userdata(p->vtable, u); return 1; } -static int process_message(sd_bus *bus, sd_bus_message *m) { +static int add_enumerated_to_set(sd_bus *bus, const char *prefix, struct node_enumerator *first, Set *s) { + struct node_enumerator *c; int r; assert(bus); - assert(m); + assert(prefix); + assert(s); - r = process_reply(bus, m); - if (r != 0) - return r; + LIST_FOREACH(enumerators, c, first) { + char **children = NULL, **k; - r = process_filter(bus, m); - if (r != 0) - return r; + r = c->callback(bus, prefix, &children, c->userdata); + if (r < 0) + return r; - r = process_builtin(bus, m); - if (r != 0) - return r; + STRV_FOREACH(k, children) { + if (r < 0) { + free(*k); + continue; + } - return process_object(bus, m); + if (!object_path_is_valid(*k) && object_path_startswith(*k, prefix)) { + free(*k); + r = -EINVAL; + continue; + } + + r = set_consume(s, *k); + } + + free(children); + if (r < 0) + return r; + } + + return 0; } -int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { +static int add_subtree_to_set(sd_bus *bus, const char *prefix, struct node *n, Set *s) { + struct node *i; 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(bus); + assert(prefix); + assert(n); + assert(s); - if (!bus) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->fd < 0) - return -ENOTCONN; + r = add_enumerated_to_set(bus, prefix, n->enumerators, s); + if (r < 0) + return r; - if (bus->state == BUS_OPENING) { - struct pollfd p; + LIST_FOREACH(siblings, i, n->child) { + char *t; - zero(p); - p.fd = bus->fd; - p.events = POLLOUT; + t = strdup(i->path); + if (!t) + return -ENOMEM; + + r = set_consume(s, t); + if (r < 0 && r != -EEXIST) + return r; - r = poll(&p, 1, 0); + r = add_subtree_to_set(bus, prefix, i, s); if (r < 0) - return -errno; + return r; + } - if (p.revents & (POLLOUT|POLLERR|POLLHUP)) { - int error = 0; - socklen_t slen = sizeof(error); + return 0; +} - r = getsockopt(bus->fd, SOL_SOCKET, SO_ERROR, &error, &slen); - if (r < 0) - bus->last_connect_error = errno; - else if (error != 0) - bus->last_connect_error = error; - else if (p.revents & (POLLERR|POLLHUP)) - bus->last_connect_error = ECONNREFUSED; - else { - r = bus_start_auth(bus); - goto null_message; - } +static int get_child_nodes(sd_bus *bus, const char *prefix, struct node *n, Set **_s) { + Set *s = NULL; + int r; - /* Try next address */ - r = bus_start_connect(bus); - goto null_message; - } + assert(bus); + assert(n); + assert(_s); - r = 0; - goto null_message; + s = set_new(string_hash_func, string_compare_func); + if (!s) + return -ENOMEM; + + r = add_subtree_to_set(bus, prefix, n, s); + if (r < 0) { + set_free_free(s); + return r; + } - } else if (bus->state == BUS_AUTHENTICATING) { + *_s = s; + return 0; +} - if (now(CLOCK_MONOTONIC) >= bus->auth_timeout) - return -ETIMEDOUT; +static int node_callbacks_run( + sd_bus *bus, + sd_bus_message *m, + struct node_callback *first, + bool require_fallback, + bool *found_object) { - r = bus_write_auth(bus); - if (r != 0) - goto null_message; + struct node_callback *c; + int r; - r = bus_read_auth(bus); - goto null_message; + assert(bus); + assert(m); + assert(found_object); - } else if (bus->state == BUS_RUNNING || bus->state == BUS_HELLO) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL; - int k; + LIST_FOREACH(callbacks, c, first) { + if (require_fallback && !c->is_fallback) + continue; - r = process_timeout(bus); - if (r != 0) - goto null_message; + *found_object = true; - r = dispatch_wqueue(bus); - if (r != 0) - goto null_message; + if (c->last_iteration == bus->iteration_counter) + continue; - k = r; - r = dispatch_rqueue(bus, &m); + r = sd_bus_message_rewind(m, true); if (r < 0) return r; - if (!m) { - if (r == 0) - r = k; - goto null_message; - } - r = process_message(bus, m); + r = c->callback(bus, m, c->userdata); if (r != 0) - goto null_message; - - if (ret) { - *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_INIT; - - 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); - if (r < 0) - return r; - } - - return 1; + return r; } - assert_not_reached("Unknown state"); - -null_message: - if (r >= 0 && ret) - *ret = NULL; - - return r; + return 0; } -static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) { - struct pollfd p; - int r, e; - struct timespec ts; - usec_t until, m; +static int method_callbacks_run( + sd_bus *bus, + sd_bus_message *m, + struct vtable_member *c, + bool require_fallback, + bool *found_object) { + + const char *signature; + void *u; + int r; assert(bus); + assert(m); + assert(c); + assert(found_object); - if (bus->fd < 0) - return -ENOTCONN; + if (require_fallback && !c->parent->is_fallback) + return 0; - e = sd_bus_get_events(bus); - if (e < 0) - return e; + r = node_vtable_get_userdata(bus, m->path, c->parent, &u); + if (r <= 0) + return r; - if (need_more) - e |= POLLIN; + *found_object = true; - r = sd_bus_get_timeout(bus, &until); + r = sd_bus_message_rewind(m, true); if (r < 0) return r; - if (r == 0) - m = (uint64_t) -1; - else { - usec_t n; - n = now(CLOCK_MONOTONIC); - m = until > n ? until - n : 0; - } - if (timeout_usec != (uint64_t) -1 && (m == (uint64_t) -1 || timeout_usec < m)) - m = timeout_usec; + r = sd_bus_message_get_signature(m, true, &signature); + if (r < 0) + return r; - zero(p); - p.fd = bus->fd; - p.events = e; + if (!streq(c->vtable->method.signature, signature)) { + r = sd_bus_reply_method_errorf(bus, m, + "org.freedesktop.DBus.Error.InvalidArgs", + "Invalid arguments '%s' to call %s:%s, expecting '%s'.", + signature, c->interface, c->member, c->vtable->method.signature); + if (r < 0) + return r; - r = ppoll(&p, 1, m == (uint64_t) -1 ? NULL : timespec_store(&ts, m), NULL); - if (r < 0) - return -errno; + return 1; + } - return r > 0 ? 1 : 0; + return c->vtable->method.handler(bus, m, u); } -int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) { +static int property_get_set_callbacks_run( + sd_bus *bus, + sd_bus_message *m, + struct vtable_member *c, + bool require_fallback, + bool is_get, + bool *found_object) { - if (!bus) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->fd < 0) - return -ENOTCONN; - if (bus->rqueue_size > 0) - return 0; + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + void *u; + int r; - return bus_poll(bus, false, timeout_usec); -} + assert(bus); + assert(m); + assert(found_object); -int sd_bus_flush(sd_bus *bus) { - int r; + if (require_fallback && !c->parent->is_fallback) + return 0; - if (!bus) - return -EINVAL; - if (bus->state == BUS_UNSET) - return -ENOTCONN; - if (bus->fd < 0) - return -ENOTCONN; + r = vtable_property_get_userdata(bus, m->path, c, &u); + if (r <= 0) + return r; - r = bus_ensure_running(bus); + *found_object = true; + + r = sd_bus_message_new_method_return(bus, m, &reply); if (r < 0) return r; - if (bus->wqueue_size <= 0) - return 0; + c->last_iteration = bus->iteration_counter; - for (;;) { - r = dispatch_wqueue(bus); + if (is_get) { + r = sd_bus_message_open_container(reply, 'v', c->vtable->property.signature); if (r < 0) return r; - if (bus->wqueue_size <= 0) - return 0; + if (c->vtable->property.get) { + r = c->vtable->property.get(bus, m->path, c->interface, c->member, reply, &error, u); + if (r < 0) + return r; + } else + assert_not_reached("automatic properties not supported yet"); - r = bus_poll(bus, false, (uint64_t) -1); - if (r < 0) + if (sd_bus_error_is_set(&error)) { + r = sd_bus_reply_method_error(bus, m, &error); + if (r < 0) + return r; + + return 1; + } + + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; + + } else { + if (c->vtable->type != _SD_BUS_VTABLE_WRITABLE_PROPERTY) + sd_bus_error_setf(&error, "org.freedesktop.DBus.Error.PropertyReadOnly", "Property '%s' is not writable.", c->member); + else { + r = sd_bus_message_enter_container(m, 'v', c->vtable->property.signature); + if (r < 0) + return r; + + if (c->vtable->property.set) { + r = c->vtable->property.set(bus, m->path, c->interface, c->member, m, &error, u); + if (r < 0) + return r; + } else + assert_not_reached("automatic properties not supported yet"); + } + + if (sd_bus_error_is_set(&error)) { + r = sd_bus_reply_method_error(bus, m, &error); + if (r < 0) + return r; + + return 1; + } + + r = sd_bus_message_exit_container(m); + if (r < 0) + return r; + } + + r = sd_bus_send(bus, reply, NULL); + if (r < 0) + return r; + + return 1; +} + +static int vtable_append_all_properties( + sd_bus *bus, + sd_bus_message *reply, + const char *path, + struct node_vtable *c, + void *userdata, + sd_bus_error *error) { + + const sd_bus_vtable *v; + int r; + + assert(bus); + assert(reply); + assert(c); + + for (v = c->vtable+1; v->type != _SD_BUS_VTABLE_END; v++) { + if (v->type != _SD_BUS_VTABLE_PROPERTY && v->type != _SD_BUS_VTABLE_WRITABLE_PROPERTY) + continue; + + r = sd_bus_message_open_container(reply, 'e', "sv"); + if (r < 0) + return r; + + r = sd_bus_message_append(reply, "s", c->interface); + if (r < 0) + return r; + + r = sd_bus_message_open_container(reply, 'v', v->property.signature); + if (r < 0) + return r; + + r = v->property.get(bus, path, c->interface, v->property.member, reply, error, vtable_property_convert_userdata(v, userdata)); + if (r < 0) + return r; + + if (sd_bus_error_is_set(error)) + return 0; + + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; + + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; + } + + return 1; +} + +static int property_get_all_callbacks_run( + sd_bus *bus, + sd_bus_message *m, + struct node_vtable *first, + bool require_fallback, + const char *iface, + bool *found_object) { + + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + struct node_vtable *c; + bool found_interface = false; + int r; + + assert(bus); + assert(m); + assert(found_object); + + r = sd_bus_message_new_method_return(bus, m, &reply); + if (r < 0) + return r; + + r = sd_bus_message_open_container(reply, 'a', "{sv}"); + if (r < 0) + return r; + + LIST_FOREACH(vtables, c, first) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + void *u; + + if (require_fallback && !c->is_fallback) + continue; + + r = node_vtable_get_userdata(bus, m->path, c, &u); + if (r < 0) + return r; + if (r == 0) + continue; + + *found_object = true; + + if (iface && !streq(c->interface, iface)) + continue; + found_interface = true; + + c->last_iteration = bus->iteration_counter; + + r = vtable_append_all_properties(bus, reply, m->path, c, u, &error); + if (r < 0) + return r; + + if (sd_bus_error_is_set(&error)) { + r = sd_bus_reply_method_error(bus, m, &error); + if (r < 0) + return r; + + return 1; + } + } + + if (!found_interface) { + r = sd_bus_reply_method_errorf( + bus, m, + "org.freedesktop.DBus.Error.UnknownInterface", + "Unknown interface '%s'.", iface); + if (r < 0) + return r; + + return 1; + } + + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; + + r = sd_bus_send(bus, reply, NULL); + if (r < 0) + return r; + + return 1; +} + +static bool bus_node_with_object_manager(sd_bus *bus, struct node *n) { + assert(bus); + + if (n->object_manager) + return true; + + if (n->parent) + return bus_node_with_object_manager(bus, n->parent); + + return false; +} + +static bool bus_node_exists(sd_bus *bus, struct node *n, const char *path, bool require_fallback) { + struct node_vtable *c; + struct node_callback *k; + + assert(bus); + assert(n); + + /* Tests if there's anything attached directly to this node + * for the specified path */ + + LIST_FOREACH(callbacks, k, n->callbacks) { + if (require_fallback && !k->is_fallback) + continue; + + return true; + } + + LIST_FOREACH(vtables, c, n->vtables) { + + if (require_fallback && !c->is_fallback) + continue; + + if (node_vtable_get_userdata(bus, path, c, NULL) > 0) + return true; + } + + return !require_fallback && (n->enumerators || n->object_manager); +} + +static int process_introspect( + sd_bus *bus, + sd_bus_message *m, + struct node *n, + bool require_fallback, + bool *found_object) { + + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_set_free_free_ Set *s = NULL; + struct introspect intro; + struct node_vtable *c; + bool empty; + int r; + + assert(bus); + assert(m); + assert(n); + assert(found_object); + + r = get_child_nodes(bus, m->path, n, &s); + if (r < 0) + return r; + + r = introspect_begin(&intro); + if (r < 0) + return r; + + r = introspect_write_default_interfaces(&intro, bus_node_with_object_manager(bus, n)); + if (r < 0) + return r; + + empty = set_isempty(s); + + LIST_FOREACH(vtables, c, n->vtables) { + if (require_fallback && !c->is_fallback) + continue; + + r = node_vtable_get_userdata(bus, m->path, c, NULL); + if (r < 0) + return r; + if (r == 0) + continue; + + empty = false; + + r = introspect_write_interface(&intro, c->interface, c->vtable); + if (r < 0) + goto finish; + } + + if (empty) { + /* Nothing?, let's see if we exist at all, and if not + * refuse to do anything */ + r = bus_node_exists(bus, n, m->path, require_fallback); + if (r < 0) + return r; + + if (r == 0) + goto finish; + } + + *found_object = true; + + r = introspect_write_child_nodes(&intro, s, m->path); + if (r < 0) + goto finish; + + r = introspect_finish(&intro, bus, m, &reply); + if (r < 0) + goto finish; + + r = sd_bus_send(bus, reply, NULL); + if (r < 0) + goto finish; + + r = 1; + +finish: + introspect_free(&intro); + return r; +} + +static int object_manager_serialize_vtable( + sd_bus *bus, + sd_bus_message *reply, + const char *path, + struct node_vtable *c, + sd_bus_error *error) { + + void *u; + int r; + + assert(bus); + assert(reply); + assert(path); + assert(c); + assert(error); + + r = node_vtable_get_userdata(bus, path, c, &u); + if (r <= 0) + return r; + + r = sd_bus_message_open_container(reply, 'e', "sa{sv}"); + if (r < 0) + return r; + + r = sd_bus_message_append(reply, "s", c->interface); + if (r < 0) + return r; + + r = sd_bus_message_open_container(reply, 'a', "{sv}"); + if (r < 0) + return r; + + r = vtable_append_all_properties(bus, reply, path, c, u, error); + if (r < 0) + return r; + + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; + + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; + + return 0; +} + +static int object_manager_serialize_path( + sd_bus *bus, + sd_bus_message *reply, + const char *path, + bool require_fallback, + sd_bus_error *error) { + + struct node_vtable *i; + struct node *n; + int r; + + assert(bus); + assert(reply); + assert(path); + assert(error); + + n = hashmap_get(bus->nodes, path); + if (!n) + return 0; + + r = sd_bus_message_open_container(reply, 'e', "oa{sa{sv}}"); + if (r < 0) + return r; + + r = sd_bus_message_append(reply, "o", path); + if (r < 0) + return r; + + r = sd_bus_message_open_container(reply, 'a', "{sa{sv}}"); + if (r < 0) + return r; + + LIST_FOREACH(vtables, i, n->vtables) { + + if (require_fallback && !i->is_fallback) + continue; + + r = object_manager_serialize_vtable(bus, reply, path, i, error); + if (r < 0) return r; + if (sd_bus_error_is_set(error)) + return 0; } + + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; + + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; + + return 1; +} + +static int object_manager_serialize_path_and_fallbacks( + sd_bus *bus, + sd_bus_message *reply, + const char *path, + sd_bus_error *error) { + + size_t pl; + int r; + + assert(bus); + assert(reply); + assert(path); + assert(error); + + /* First, add all vtables registered for this path */ + r = object_manager_serialize_path(bus, reply, path, false, error); + if (r < 0) + return r; + if (sd_bus_error_is_set(error)) + return 0; + + /* Second, add fallback vtables registered for any of the prefixes */ + pl = strlen(path); + if (pl > 1) { + char p[pl + 1]; + strcpy(p, path); + + for (;;) { + char *e; + + e = strrchr(p, '/'); + if (e == p || !e) + break; + + *e = 0; + + r = object_manager_serialize_path(bus, reply, p, true, error); + if (r < 0) + return r; + + if (sd_bus_error_is_set(error)) + return 0; + } + } + + return 0; +} + +static int process_get_managed_objects( + sd_bus *bus, + sd_bus_message *m, + struct node *n, + bool require_fallback, + bool *found_object) { + + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_set_free_free_ Set *s = NULL; + bool empty; + int r; + + assert(bus); + assert(m); + assert(n); + assert(found_object); + + if (!bus_node_with_object_manager(bus, n)) + return 0; + + r = get_child_nodes(bus, m->path, n, &s); + if (r < 0) + return r; + + r = sd_bus_message_new_method_return(bus, m, &reply); + if (r < 0) + return r; + + r = sd_bus_message_open_container(reply, 'a', "{oa{sa{sv}}}"); + if (r < 0) + return r; + + empty = set_isempty(s); + if (empty) { + struct node_vtable *c; + + /* Hmm, so we have no children? Then let's check + * whether we exist at all, i.e. whether at least one + * vtable exists. */ + + LIST_FOREACH(vtables, c, n->vtables) { + + if (require_fallback && !c->is_fallback) + continue; + + if (r < 0) + return r; + if (r == 0) + continue; + + empty = false; + break; + } + + if (empty) + return 0; + } else { + Iterator i; + char *path; + + SET_FOREACH(path, s, i) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + + r = object_manager_serialize_path_and_fallbacks(bus, reply, path, &error); + if (r < 0) + return -ENOMEM; + + if (sd_bus_error_is_set(&error)) { + r = sd_bus_reply_method_error(bus, m, &error); + if (r < 0) + return r; + + return 1; + } + } + } + + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; + + r = sd_bus_send(bus, reply, NULL); + if (r < 0) + return r; + + return 1; +} + +static int object_find_and_run(sd_bus *bus, sd_bus_message *m, const char *p, bool require_fallback, bool *found_object) { + struct node *n; + struct vtable_member vtable_key, *v; + int r; + + assert(bus); + assert(m); + assert(p); + assert(found_object); + + n = hashmap_get(bus->nodes, p); + if (!n) + return 0; + + /* First, try object callbacks */ + r = node_callbacks_run(bus, m, n->callbacks, require_fallback, found_object); + if (r != 0) + return r; + + if (!m->interface || !m->member) + return 0; + + /* Then, look for a known method */ + vtable_key.path = (char*) p; + vtable_key.interface = m->interface; + vtable_key.member = m->member; + + v = hashmap_get(bus->vtable_methods, &vtable_key); + if (v) { + r = method_callbacks_run(bus, m, v, require_fallback, found_object); + if (r != 0) + return r; + } + + /* Then, look for a known property */ + if (streq(m->interface, "org.freedesktop.DBus.Properties")) { + bool get = false; + + get = streq(m->member, "Get"); + + if (get || streq(m->member, "Set")) { + + r = sd_bus_message_rewind(m, true); + if (r < 0) + return r; + + vtable_key.path = (char*) p; + + r = sd_bus_message_read(m, "ss", &vtable_key.interface, &vtable_key.member); + if (r < 0) + return r; + + v = hashmap_get(bus->vtable_properties, &vtable_key); + if (v) { + r = property_get_set_callbacks_run(bus, m, v, require_fallback, get, found_object); + if (r != 0) + return r; + } + + } else if (streq(m->member, "GetAll")) { + const char *iface; + + r = sd_bus_message_rewind(m, true); + if (r < 0) + return r; + + r = sd_bus_message_read(m, "s", &iface); + if (r < 0) + return r; + + if (iface[0] == 0) + iface = NULL; + + r = property_get_all_callbacks_run(bus, m, n->vtables, require_fallback, iface, found_object); + if (r != 0) + return r; + } + + } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) { + + r = process_introspect(bus, m, n, require_fallback, found_object); + if (r != 0) + return r; + + } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus.ObjectManager", "GetManagedObjects")) { + + r = process_get_managed_objects(bus, m, n, require_fallback, found_object); + if (r != 0) + return r; + } + + if (!*found_object) { + r = bus_node_exists(bus, n, m->path, require_fallback); + if (r < 0) + return r; + + if (r > 0) + *found_object = true; + } + + return 0; +} + +static int process_object(sd_bus *bus, sd_bus_message *m) { + int r; + size_t pl; + bool found_object = false; + + assert(bus); + assert(m); + + if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) + return 0; + + if (!m->path) + return 0; + + if (hashmap_isempty(bus->nodes)) + return 0; + + pl = strlen(m->path); + do { + char p[pl+1]; + + bus->nodes_modified = false; + + r = object_find_and_run(bus, m, m->path, false, &found_object); + if (r != 0) + return r; + + /* Look for fallback prefixes */ + strcpy(p, m->path); + for (;;) { + char *e; + + if (streq(p, "/")) + break; + + if (bus->nodes_modified) + break; + + e = strrchr(p, '/'); + assert(e); + if (e == p) + *(e+1) = 0; + else + *e = 0; + + r = object_find_and_run(bus, m, p, true, &found_object); + if (r != 0) + return r; + } + + } while (bus->nodes_modified); + + if (!found_object) + return 0; + + if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Properties", "Get") || + sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Properties", "Set")) + r = sd_bus_reply_method_errorf( + bus, m, + "org.freedesktop.DBus.Error.UnknownProperty", + "Unknown property or interface."); + else + r = sd_bus_reply_method_errorf( + bus, m, + "org.freedesktop.DBus.Error.UnknownMethod", + "Unknown method '%s' or interface '%s'.", m->member, m->interface); + + 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++; + + r = process_hello(bus, m); + if (r != 0) + return r; + + r = process_reply(bus, m); + if (r != 0) + return r; + + r = process_filter(bus, m); + if (r != 0) + return r; + + r = process_match(bus, m); + if (r != 0) + return r; + + r = process_builtin(bus, m); + if (r != 0) + return r; + + return process_object(bus, m); +} + +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_TYPE_METHOD_CALL) { + + r = sd_bus_reply_method_errorf( + bus, m, + "org.freedesktop.DBus.Error.UnknownObject", + "Unknown object '%s'.", m->path); + if (r < 0) + return r; + } + + return 1; + +null_message: + if (r >= 0 && ret) + *ret = NULL; + + return r; +} + +int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { + 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. */ + + if (!bus) + return -EINVAL; + if (bus_pid_changed(bus)) + return -ECHILD; + + /* We don't allow recursively invoking sd_bus_process(). */ + if (bus->processing) + return -EBUSY; + + switch (bus->state) { + + case BUS_UNSET: + case BUS_CLOSED: + return -ENOTCONN; + + case BUS_OPENING: + r = bus_socket_process_opening(bus); + if (r < 0) + return r; + if (ret) + *ret = NULL; + return r; + + case BUS_AUTHENTICATING: + + r = bus_socket_process_authenticating(bus); + 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; + + return r; + } + + 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 until, m; + + assert(bus); + + if (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + + e = sd_bus_get_events(bus); + if (e < 0) + return e; + + if (need_more) + 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; + } + + if (timeout_usec != (uint64_t) -1 && (m == (uint64_t) -1 || timeout_usec < m)) + m = timeout_usec; + + 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 -errno; + + return r > 0 ? 1 : 0; +} + +int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) { + + if (!bus) + return -EINVAL; + if (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + if (bus_pid_changed(bus)) + return -ECHILD; + + if (bus->rqueue_size > 0) + return 0; + + return bus_poll(bus, false, timeout_usec); +} + +int sd_bus_flush(sd_bus *bus) { + int r; + + if (!bus) + return -EINVAL; + if (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + if (bus_pid_changed(bus)) + return -ECHILD; + + r = bus_ensure_running(bus); + if (r < 0) + return r; + + if (bus->wqueue_size <= 0) + return 0; + + for (;;) { + r = dispatch_wqueue(bus); + if (r < 0) + return r; + + if (bus->wqueue_size <= 0) + return 0; + + r = bus_poll(bus, false, (uint64_t) -1); + if (r < 0) + return r; + } +} + +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; + if (bus_pid_changed(bus)) + return -ECHILD; + + f = new0(struct filter_callback, 1); + if (!f) + return -ENOMEM; + f->callback = callback; + f->userdata = userdata; + + bus->filter_callbacks_modified = true; + LIST_PREPEND(struct filter_callback, callbacks, bus->filter_callbacks, f); + return 0; +} + +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; + if (bus_pid_changed(bus)) + return -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); + free(f); + return 1; + } + } + + return 0; +} + +static struct node *bus_node_allocate(sd_bus *bus, const char *path) { + struct node *n, *parent; + const char *e; + char *s, *p; + int r; + + assert(bus); + assert(path); + assert(path[0] == '/'); + + n = hashmap_get(bus->nodes, path); + if (n) + return n; + + r = hashmap_ensure_allocated(&bus->nodes, string_hash_func, string_compare_func); + if (r < 0) + return NULL; + + s = strdup(path); + if (!s) + return NULL; + + if (streq(path, "/")) + parent = NULL; + else { + e = strrchr(path, '/'); + assert(e); + + p = strndupa(path, MAX(1, path - e)); + + parent = bus_node_allocate(bus, p); + if (!parent) { + free(s); + return NULL; + } + } + + n = new0(struct node, 1); + if (!n) + return NULL; + + n->parent = parent; + n->path = s; + + r = hashmap_put(bus->nodes, s, n); + if (r < 0) { + free(s); + free(n); + return NULL; + } + + if (parent) + LIST_PREPEND(struct node, siblings, parent->child, n); + + return n; +} + +static void bus_node_gc(sd_bus *b, struct node *n) { + assert(b); + + if (!n) + return; + + if (n->child || + n->callbacks || + n->vtables || + n->enumerators || + n->object_manager) + return; + + assert(hashmap_remove(b->nodes, n->path) == n); + + if (n->parent) + LIST_REMOVE(struct node, siblings, n->parent->child, n); + + free(n->path); + bus_node_gc(b, n->parent); + free(n); +} + +static int bus_add_object( + sd_bus *b, + bool fallback, + const char *path, + sd_bus_message_handler_t callback, + void *userdata) { + + struct node_callback *c; + struct node *n; + int r; + + if (!b) + return -EINVAL; + if (!object_path_is_valid(path)) + return -EINVAL; + if (!callback) + return -EINVAL; + if (bus_pid_changed(b)) + return -ECHILD; + + n = bus_node_allocate(b, path); + if (!n) + return -ENOMEM; + + c = new0(struct node_callback, 1); + if (!c) { + r = -ENOMEM; + goto fail; + } + + c->node = n; + c->callback = callback; + c->userdata = userdata; + c->is_fallback = fallback; + + LIST_PREPEND(struct node_callback, callbacks, n->callbacks, c); + return 0; + +fail: + free(c); + bus_node_gc(b, n); + return r; +} + +static int bus_remove_object( + sd_bus *bus, + bool fallback, + const char *path, + sd_bus_message_handler_t callback, + void *userdata) { + + struct node_callback *c; + struct node *n; + + if (!bus) + return -EINVAL; + if (!object_path_is_valid(path)) + return -EINVAL; + if (!callback) + return -EINVAL; + if (bus_pid_changed(bus)) + return -ECHILD; + + n = hashmap_get(bus->nodes, path); + if (!n) + return 0; + + LIST_FOREACH(callbacks, c, n->callbacks) + if (c->callback == callback && c->userdata == userdata && c->is_fallback == fallback) + break; + if (!c) + return 0; + + LIST_REMOVE(struct node_callback, callbacks, n->callbacks, c); + free(c); + + bus_node_gc(bus, n); + + return 1; +} + +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); +} + +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); +} + +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); +} + +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); +} + +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; + + if (!bus) + return -EINVAL; + if (!match) + return -EINVAL; + if (bus_pid_changed(bus)) + return -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; +} + +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; + + if (!bus) + return -EINVAL; + if (!match) + return -EINVAL; + if (bus_pid_changed(bus)) + return -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; +} + +int sd_bus_emit_signal( + sd_bus *bus, + const char *path, + const char *interface, + const char *member, + const char *types, ...) { + + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + va_list ap; + int r; + + if (!bus) + return -EINVAL; + if (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + if (bus_pid_changed(bus)) + return -ECHILD; + + r = sd_bus_message_new_signal(bus, path, interface, member, &m); + 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; + + return sd_bus_send(bus, m, NULL); +} + +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, ...) { + + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + va_list ap; + int r; + + if (!bus) + + return -EINVAL; + if (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + if (bus_pid_changed(bus)) + return -ECHILD; + + r = sd_bus_message_new_method_call(bus, destination, path, interface, member, &m); + 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; + + return sd_bus_send_with_reply_and_block(bus, m, 0, error, reply); +} + +int sd_bus_reply_method_return( + sd_bus *bus, + sd_bus_message *call, + const char *types, ...) { + + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + va_list ap; + 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; + if (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + if (bus_pid_changed(bus)) + return -ECHILD; + + if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) + return 0; + + r = sd_bus_message_new_method_return(bus, call, &m); + 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; + + return sd_bus_send(bus, m, NULL); +} + +int sd_bus_reply_method_error( + sd_bus *bus, + sd_bus_message *call, + const sd_bus_error *e) { + + _cleanup_bus_message_unref_ sd_bus_message *m = 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; + if (!sd_bus_error_is_set(e)) + return -EINVAL; + if (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + if (bus_pid_changed(bus)) + return -ECHILD; + + if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) + return 0; + + r = sd_bus_message_new_method_error(bus, call, e, &m); + if (r < 0) + return r; + + return sd_bus_send(bus, m, NULL); +} + +int sd_bus_reply_method_errorf( + sd_bus *bus, + sd_bus_message *call, + const char *name, + const char *format, + ...) { + + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + char *n, *m; + va_list ap; + int r; + + n = strdup(name); + if (!n) + return -ENOMEM; + + if (format) { + va_start(ap, format); + r = vasprintf(&m, format, ap); + va_end(ap); + + if (r < 0) { + free(n); + return -ENOMEM; + } + } + + error.name = n; + error.message = m; + error.need_free = true; + + return sd_bus_reply_method_error(bus, call, &error); +} + +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 void free_node_vtable(sd_bus *bus, struct node_vtable *w) { + assert(bus); + + if (!w) + return; + + if (w->interface && w->node && w->vtable) { + const sd_bus_vtable *v; + + for (v = w->vtable; v->type != _SD_BUS_VTABLE_END; w++) { + struct vtable_member *x = NULL; + + switch (v->type) { + + case _SD_BUS_VTABLE_METHOD: { + struct vtable_member key; + + key.path = w->node->path; + key.interface = w->interface; + key.member = v->method.member; + + x = hashmap_remove(bus->vtable_methods, &key); + break; + } + + case _SD_BUS_VTABLE_PROPERTY: + case _SD_BUS_VTABLE_WRITABLE_PROPERTY: { + struct vtable_member key; + + key.path = w->node->path; + key.interface = w->interface; + key.member = v->property.member; + x = hashmap_remove(bus->vtable_properties, &key); + break; + }} + + free(x); + } + } + + free(w->interface); + free(w); +} + +static unsigned vtable_member_hash_func(const void *a) { + const struct vtable_member *m = a; + + return + string_hash_func(m->path) ^ + string_hash_func(m->interface) ^ + string_hash_func(m->member); +} + +static int vtable_member_compare_func(const void *a, const void *b) { + const struct vtable_member *x = a, *y = b; + int r; + + r = strcmp(x->path, y->path); + if (r != 0) + return r; + + r = strcmp(x->interface, y->interface); + if (r != 0) + return r; + + return strcmp(x->member, y->member); +} + +static int add_object_vtable_internal( + sd_bus *bus, + const char *path, + const char *interface, + const sd_bus_vtable *vtable, + bool fallback, + sd_bus_object_find_t find, + void *userdata) { + + struct node_vtable *c, *i; + const sd_bus_vtable *v; + struct node *n; + int r; + + if (!bus) + return -EINVAL; + if (!object_path_is_valid(path)) + return -EINVAL; + if (!interface_name_is_valid(interface)) + return -EINVAL; + if (!vtable || vtable[0].type != _SD_BUS_VTABLE_START || vtable[0].start.element_size != sizeof(struct sd_bus_vtable)) + return -EINVAL; + if (bus_pid_changed(bus)) + return -ECHILD; + + r = hashmap_ensure_allocated(&bus->vtable_methods, vtable_member_hash_func, vtable_member_compare_func); + if (r < 0) + return r; + + r = hashmap_ensure_allocated(&bus->vtable_properties, vtable_member_hash_func, vtable_member_compare_func); + if (r < 0) + return r; + + n = bus_node_allocate(bus, path); + if (!n) + return -ENOMEM; + + LIST_FOREACH(vtables, i, n->vtables) { + if (streq(i->interface, interface)) { + r = -EEXIST; + goto fail; + } + + if (i->is_fallback != fallback) { + r = -EPROTOTYPE; + goto fail; + } + } + + c = new0(struct node_vtable, 1); + if (!c) { + r = -ENOMEM; + goto fail; + } + + c->node = n; + c->is_fallback = fallback; + c->vtable = vtable; + c->userdata = userdata; + c->find = find; + + c->interface = strdup(interface); + if (!c->interface) { + r = -ENOMEM; + goto fail; + } + + for (v = c->vtable+1; v->type != _SD_BUS_VTABLE_END; v++) { + + switch (v->type) { + + case _SD_BUS_VTABLE_METHOD: { + struct vtable_member *m; + + if (!member_name_is_valid(v->method.member) || + !signature_is_valid(v->method.signature, false) || + !signature_is_valid(v->method.result, false) || + !v->method.handler || + v->flags & (SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE|SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY)) { + r = -EINVAL; + goto fail; + } + + m = new0(struct vtable_member, 1); + if (!m) { + r = -ENOMEM; + goto fail; + } + + m->parent = c; + m->path = n->path; + m->interface = c->interface; + m->member = v->method.member; + m->vtable = v; + + r = hashmap_put(bus->vtable_methods, m, m); + if (r < 0) { + free(m); + goto fail; + } + + break; + } + + case _SD_BUS_VTABLE_PROPERTY: + case _SD_BUS_VTABLE_WRITABLE_PROPERTY: { + struct vtable_member *m; + + if (!member_name_is_valid(v->property.member) || + !signature_is_single(v->property.signature, false) || + v->flags & SD_BUS_VTABLE_METHOD_NO_REPLY || + (v->flags & SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY && !(v->flags & SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE))) { + r = -EINVAL; + goto fail; + } + + + m = new0(struct vtable_member, 1); + if (!m) { + r = -ENOMEM; + goto fail; + } + + m->parent = c; + m->path = n->path; + m->interface = c->interface; + m->member = v->property.member; + m->vtable = v; + + r = hashmap_put(bus->vtable_properties, m, m); + if (r < 0) { + free(m); + goto fail; + } + + break; + } + + case _SD_BUS_VTABLE_SIGNAL: + + if (!member_name_is_valid(v->signal.member) || + !signature_is_single(v->signal.signature, false)) { + r = -EINVAL; + goto fail; + } + + break; + + default: + r = -EINVAL; + goto fail; + } + } + + LIST_PREPEND(struct node_vtable, vtables, n->vtables, c); + return 0; + +fail: + if (c) + free_node_vtable(bus, c); + + bus_node_gc(bus, n); + return 0; +} + +static int remove_object_vtable_internal( + sd_bus *bus, + const char *path, + const char *interface, + bool fallback) { + + struct node_vtable *c; + struct node *n; + + if (!bus) + return -EINVAL; + if (!object_path_is_valid(path)) + return -EINVAL; + if (!interface_name_is_valid(interface)) + return -EINVAL; + if (bus_pid_changed(bus)) + return -ECHILD; + + n = hashmap_get(bus->nodes, path); + if (!n) + return 0; + + LIST_FOREACH(vtables, c, n->vtables) + if (streq(c->interface, interface) && c->is_fallback == fallback) + break; + + if (!c) + return 0; + + LIST_REMOVE(struct node_vtable, vtables, n->vtables, c); + + free_node_vtable(bus, c); + return 1; } -int sd_bus_add_filter(sd_bus *bus, sd_message_handler_t callback, void *userdata) { - struct filter_callback *f; +int sd_bus_add_object_vtable( + sd_bus *bus, + const char *path, + const char *interface, + const sd_bus_vtable *vtable, + void *userdata) { + + return add_object_vtable_internal(bus, path, interface, vtable, false, NULL, userdata); +} + +int sd_bus_remove_object_vtable( + sd_bus *bus, + const char *path, + const char *interface) { + + return remove_object_vtable_internal(bus, path, interface, false); +} + +int sd_bus_add_fallback_vtable( + sd_bus *bus, + const char *path, + const char *interface, + const sd_bus_vtable *vtable, + sd_bus_object_find_t find, + void *userdata) { + + return add_object_vtable_internal(bus, path, interface, vtable, true, find, userdata); +} + +int sd_bus_remove_fallback_vtable( + sd_bus *bus, + const char *path, + const char *interface) { + + return remove_object_vtable_internal(bus, path, interface, true); +} + +int sd_bus_add_node_enumerator( + sd_bus *bus, + const char *path, + sd_bus_node_enumerator_t callback, + void *userdata) { + + struct node_enumerator *c; + struct node *n; + int r; if (!bus) return -EINVAL; + if (!object_path_is_valid(path)) + return -EINVAL; if (!callback) return -EINVAL; + if (bus_pid_changed(bus)) + return -ECHILD; - f = new(struct filter_callback, 1); - if (!f) + n = bus_node_allocate(bus, path); + if (!n) return -ENOMEM; - f->callback = callback; - f->userdata = userdata; - LIST_PREPEND(struct filter_callback, callbacks, bus->filter_callbacks, f); + c = new0(struct node_enumerator, 1); + if (!c) { + r = -ENOMEM; + goto fail; + } + + c->node = n; + c->callback = callback; + c->userdata = userdata; + + LIST_PREPEND(struct node_enumerator, enumerators, n->enumerators, c); return 0; + +fail: + free(c); + bus_node_gc(bus, n); + return r; } -int sd_bus_remove_filter(sd_bus *bus, sd_message_handler_t callback, void *userdata) { - struct filter_callback *f; +int sd_bus_remove_node_enumerator( + sd_bus *bus, + const char *path, + sd_bus_node_enumerator_t callback, + void *userdata) { + + struct node_enumerator *c; + struct node *n; if (!bus) return -EINVAL; + if (!object_path_is_valid(path)) + return -EINVAL; if (!callback) return -EINVAL; + if (bus_pid_changed(bus)) + return -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); - free(f); - return 1; - } - } + n = hashmap_get(bus->nodes, path); + if (!n) + return 0; - return 0; + LIST_FOREACH(enumerators, c, n->enumerators) + if (c->callback == callback && c->userdata == userdata) + break; + + if (!c) + return 0; + + LIST_REMOVE(struct node_enumerator, enumerators, n->enumerators, c); + free(c); + + bus_node_gc(bus, n); + + return 1; } -static int bus_add_object( +static int emit_properties_changed_on_interface( sd_bus *bus, - bool fallback, + const char *prefix, const char *path, - sd_message_handler_t callback, - void *userdata) { + const char *interface, + bool require_fallback, + char **names) { + + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + bool has_invalidating = false; + struct vtable_member key; + struct node_vtable *c; + struct node *n; + char **property; + void *u = NULL; + int r; + + assert(bus); + assert(path); + assert(interface); + + n = hashmap_get(bus->nodes, prefix); + if (!n) + return 0; + + LIST_FOREACH(vtables, c, n->vtables) { + if (require_fallback && !c->is_fallback) + continue; + + if (streq(c->interface, interface)) + break; + + r = node_vtable_get_userdata(bus, path, c, &u); + if (r < 0) + return r; + if (r > 0) + break; + } + + if (!c) + return 0; + + r = sd_bus_message_new_signal(bus, path, "org.freedesktop.DBus", "PropertiesChanged", &m); + if (r < 0) + return r; + + r = sd_bus_message_append(m, "s", interface); + if (r < 0) + return r; + + r = sd_bus_message_open_container(m, 'a', "{sv}"); + if (r < 0) + return r; + + key.path = prefix; + key.interface = interface; + + STRV_FOREACH(property, names) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + struct vtable_member *v; + + key.member = *property; + v = hashmap_get(bus->vtable_properties, &key); + if (!v) + return -ENOENT; + + assert(c == v->parent); + + if (!(v->vtable->flags & SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE)) + return -EDOM; + if (v->vtable->flags & SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY) { + has_invalidating = true; + continue; + } + + r = sd_bus_message_open_container(m, 'e', "sv"); + if (r < 0) + return r; + + r = sd_bus_message_append(m, "s", *n); + if (r < 0) + return r; + + r = sd_bus_message_open_container(m, 'v', v->vtable->property.signature); + if (r < 0) + return r; + + r = v->vtable->property.get(bus, m->path, interface, *property, m, &error, u); + if (r < 0) + return r; + + if (sd_bus_error_is_set(&error)) + return bus_error_to_errno(&error); + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + } + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + + r = sd_bus_message_open_container(m, 'a', "s"); + if (r < 0) + return r; + + if (has_invalidating) { + STRV_FOREACH(property, names) { + struct vtable_member *v; + + key.member = *property; + assert_se(v = hashmap_get(bus->vtable_properties, &key)); + assert(c == v->parent); + + if (!(v->vtable->flags & SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY)) + continue; + + r = sd_bus_message_append(m, "s", *property); + if (r < 0) + return r; + } + } + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + + r = sd_bus_send(bus, m, NULL); + if (r < 0) + return r; + + return 1; +} - struct object_callback *c; +int sd_bus_emit_properties_changed_strv(sd_bus *bus, const char *path, const char *interface, char **names) { + size_t pl; int r; if (!bus) return -EINVAL; - if (!path) + if (!object_path_is_valid(path)) return -EINVAL; - if (!callback) + if (!interface_name_is_valid(interface)) return -EINVAL; - r = hashmap_ensure_allocated(&bus->object_callbacks, string_hash_func, string_compare_func); - if (r < 0) + r = emit_properties_changed_on_interface(bus, path, path, interface, false, names); + if (r != 0) return r; - c = new(struct object_callback, 1); - if (!c) - return -ENOMEM; + pl = strlen(path); + if (pl > 1 ) { + char p[pl+1]; - c->path = strdup(path); - if (!path) { - free(c); - return -ENOMEM; + strcpy(p, path); + for (;;) { + char *e; + + if (streq(p, "/")) + break; + + e = strrchr(p, '/'); + assert(e); + if (e == p) + *(e+1) = 0; + else + *e = 0; + + r = emit_properties_changed_on_interface(bus, p, path, interface, true, names); + if (r != 0) + return r; + } } - c->callback = callback; - c->userdata = userdata; - c->is_fallback = fallback; + return -ENOENT; +} + +int sd_bus_emit_properties_changed(sd_bus *bus, const char *path, const char *interface, const char *name, ...) { + _cleanup_strv_free_ char **names = NULL; + va_list ap; + + va_start(ap, name); + names = strv_new_ap(name, ap); + va_end(ap); + + if (!names) + return -ENOMEM; + + return sd_bus_emit_properties_changed_strv(bus, path, interface, names); +} + +int sd_bus_emit_interfaces_added(sd_bus *bus, const char *path, const char *interfaces, ...) { + return -ENOSYS; +} - r = hashmap_put(bus->object_callbacks, c->path, c); +int sd_bus_emit_interfaces_removed(sd_bus *bus, const char *path, const char *interfaces, ...) { + return -ENOSYS; +} + +int sd_bus_get_property( + 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 *type) { + + sd_bus_message *rep = NULL; + int r; + + if (interface && !interface_name_is_valid(interface)) + return -EINVAL; + if (!member_name_is_valid(member)) + return -EINVAL; + if (!signature_is_single(type, false)) + return -EINVAL; + if (!reply) + return -EINVAL; + + r = sd_bus_call_method(bus, destination, path, "org.freedesktop.DBus.Properties", "Get", error, &rep, "ss", strempty(interface), member); + if (r < 0) + return r; + + r = sd_bus_message_enter_container(rep, 'v', type); if (r < 0) { - free(c->path); - free(c); + sd_bus_message_unref(rep); return r; } + *reply = rep; return 0; } -static int bus_remove_object( +int sd_bus_set_property( sd_bus *bus, - bool fallback, + const char *destination, const char *path, - sd_message_handler_t callback, - void *userdata) { + const char *interface, + const char *member, + sd_bus_error *error, + const char *type, ...) { - struct object_callback *c; + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + va_list ap; + int r; - if (!bus) + if (interface && !interface_name_is_valid(interface)) return -EINVAL; - if (!path) + if (!member_name_is_valid(member)) return -EINVAL; - if (!callback) + if (!signature_is_single(type, false)) return -EINVAL; - c = hashmap_get(bus->object_callbacks, path); - if (!c) - return 0; + r = sd_bus_message_new_method_call(bus, destination, path, "org.freedesktop.DBus.Properties", "Set", &m); + if (r < 0) + return r; - if (c->callback != callback || c->userdata != userdata || c->is_fallback != fallback) - return 0; + r = sd_bus_message_append(m, "ss", strempty(interface), member); + if (r < 0) + return r; - assert_se(c == hashmap_remove(bus->object_callbacks, c->path)); + r = sd_bus_message_open_container(m, 'v', type); + if (r < 0) + return r; - free(c->path); - free(c); + va_start(ap, type); + r = bus_message_append_ap(m, type, ap); + va_end(ap); + if (r < 0) + return r; - return 1; -} + r = sd_bus_message_close_container(m); + if (r < 0) + return r; -int sd_bus_add_object(sd_bus *bus, const char *path, sd_message_handler_t callback, void *userdata) { - return bus_add_object(bus, false, path, callback, userdata); + return sd_bus_send_with_reply_and_block(bus, m, 0, error, NULL); } -int sd_bus_remove_object(sd_bus *bus, const char *path, sd_message_handler_t callback, void *userdata) { - return bus_remove_object(bus, false, path, callback, userdata); -} +int sd_bus_add_object_manager(sd_bus *bus, const char *path) { + struct node *n; -int sd_bus_add_fallback(sd_bus *bus, const char *prefix, sd_message_handler_t callback, void *userdata) { - return bus_add_object(bus, true, prefix, callback, userdata); + if (!bus) + return -EINVAL; + if (!object_path_is_valid(path)) + return -EINVAL; + if (bus_pid_changed(bus)) + return -ECHILD; + + n = bus_node_allocate(bus, path); + if (!n) + return -ENOMEM; + + n->object_manager = true; + return 0; } -int sd_bus_remove_fallback(sd_bus *bus, const char *prefix, sd_message_handler_t callback, void *userdata) { - return bus_remove_object(bus, true, prefix, callback, userdata); +int sd_bus_remove_object_manager(sd_bus *bus, const char *path) { + struct node *n; + + if (!bus) + return -EINVAL; + if (!object_path_is_valid(path)) + return -EINVAL; + if (bus_pid_changed(bus)) + return -ECHILD; + + n = hashmap_get(bus->nodes, path); + if (!n) + return 0; + + if (!n->object_manager) + return 0; + + n->object_manager = false; + bus_node_gc(bus, n); + return 1; }