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=b0730d495433dc3ddfccf60e9f64edafe24c5a0c;hp=6a6d43fac0a03dd01eac4f38faf6527345601804;hb=63edf05ed9c1d4cb5cf9364e734b2a96f84622d0;hpb=d728d708c3ccfcb34f6d7673f7855fbf0c10aeec diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index 6a6d43fac..b0730d495 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -26,31 +26,59 @@ #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" -static int ensure_running(sd_bus *bus); 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_free(sd_bus *b) { struct filter_callback *f; + struct object_callback *c; 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); for (i = 0; i < b->rqueue_size; i++) sd_bus_message_unref(b->rqueue[i]); @@ -68,52 +96,180 @@ static void bus_free(sd_bus *b) { free(f); } + while ((c = hashmap_steal_first(b->object_callbacks))) { + free(c->path); + free(c); + } + + hashmap_free(b->object_callbacks); + bus_match_free(&b->match_callbacks); + + bus_kernel_flush_memfd(b); + free(b); } -static sd_bus* bus_new(void) { +int sd_bus_new(sd_bus **ret) { sd_bus *r; + if (!ret) + return -EINVAL; + r = new0(sd_bus, 1); if (!r) - return NULL; + return -ENOMEM; - r->n_ref = 1; - r->fd = -1; + r->n_ref = REFCNT_INIT; + r->input_fd = r->output_fd = -1; r->message_version = 1; + r->negotiate_fds = true; /* We guarantee that wqueue always has space for at least one * entry */ r->wqueue = new(sd_bus_message*, 1); if (!r->wqueue) { free(r); - return NULL; + return -ENOMEM; } - return r; -}; + *ret = r; + return 0; +} + +int sd_bus_set_address(sd_bus *bus, const char *address) { + char *a; + + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + if (!address) + return -EINVAL; + + a = strdup(address); + if (!a) + return -ENOMEM; + + free(bus->address); + bus->address = a; + + return 0; +} + +int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) { + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + if (input_fd < 0) + return -EINVAL; + if (output_fd < 0) + return -EINVAL; + + 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; + + 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; +} -static int hello_callback(sd_bus *bus, int error, sd_bus_message *reply, void *userdata) { +int sd_bus_set_bus_client(sd_bus *bus, int b) { + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + + bus->bus_client = !!b; + return 0; +} + +int sd_bus_set_negotiate_fds(sd_bus *bus, int b) { + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + + bus->negotiate_fds = !!b; + return 0; +} + +int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id) { + if (!bus) + return -EINVAL; + if (!b && !sd_id128_equal(server_id, SD_ID128_NULL)) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + + bus->is_server = !!b; + bus->server_id = server_id; + return 0; +} + +int sd_bus_set_anonymous(sd_bus *bus, int b) { + if (!bus) + return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; + + bus->anonymous_auth = !!b; + return 0; +} + +static int hello_callback(sd_bus *bus, sd_bus_message *reply, void *userdata) { const char *s; int r; assert(bus); - - if (error != 0) - return -error; - + assert(bus->state == BUS_HELLO); assert(reply); - bus->state = BUS_RUNNING; + r = bus_message_to_errno(reply); + if (r < 0) + return r; r = sd_bus_message_read(reply, "s", &s); if (r < 0) return r; + if (!service_name_is_valid(s) || s[0] != ':') + return -EBADMSG; + bus->unique_name = strdup(s); if (!bus->unique_name) return -ENOMEM; + bus->state = BUS_RUNNING; + return 1; } @@ -123,6 +279,9 @@ static int bus_send_hello(sd_bus *bus) { assert(bus); + if (!bus->bus_client || bus->is_kernel) + return 0; + r = sd_bus_message_new_method_call( bus, "org.freedesktop.DBus", @@ -133,18 +292,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; - - bus->sent_hello = true; - 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->sent_hello) { + if (bus->bus_client && !bus->is_kernel) { bus->state = BUS_HELLO; return 1; } @@ -160,21 +314,24 @@ static int parse_address_key(const char **p, const char *key, char **value) { assert(p); assert(*p); - assert(key); assert(value); - l = strlen(key); - if (strncmp(*p, key, l) != 0) - return 0; + if (key) { + l = strlen(key); + if (strncmp(*p, key, l) != 0) + return 0; - if ((*p)[l] != '=') - return 0; + if ((*p)[l] != '=') + return 0; - if (*value) - return -EINVAL; + if (*value) + return -EINVAL; + + a = *p + l + 1; + } else + a = *p; - a = *p + l + 1; - while (*a != ',' && *a != 0) { + while (*a != ';' && *a != ',' && *a != 0) { char c, *t; if (*a == '%') { @@ -220,7 +377,10 @@ static int parse_address_key(const char **p, const char *key, char **value) { a++; *p = a; + + free(*value); *value = r; + return 1; } @@ -234,528 +394,571 @@ 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; + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + return r; + else if (r > 0) + continue; - a = b->address + b->address_index; + r = parse_address_key(p, "path", &path); + if (r < 0) + return r; + else if (r > 0) + continue; - zero(b->sockaddr); - b->sockaddr_size = 0; - b->peer = SD_ID128_NULL; + r = parse_address_key(p, "abstract", &abstract); + if (r < 0) + return r; + else if (r > 0) + continue; - if (startswith(a, "unix:")) { - _cleanup_free_ char *path = NULL, *abstract = NULL; + skip_address_key(p); + } - p = a + 5; - while (*p != 0) { - r = parse_address_key(&p, "guid", &guid); - if (r < 0) - return r; - else if (r > 0) - continue; + if (!path && !abstract) + return -EINVAL; - r = parse_address_key(&p, "path", &path); - if (r < 0) - return r; - else if (r > 0) - continue; + if (path && abstract) + return -EINVAL; - r = parse_address_key(&p, "abstract", &abstract); - if (r < 0) - return r; - else if (r > 0) - continue; + if (path) { + l = strlen(path); + if (l > sizeof(b->sockaddr.un.sun_path)) + return -E2BIG; - skip_address_key(&p); - } + 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 && abstract) - return -EINVAL; + return 0; +} - if (path) { - size_t l; +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, + }; - l = strlen(path); - if (l > sizeof(b->sockaddr.un.sun_path)) - return -E2BIG; + assert(b); + assert(p); + assert(*p); + assert(guid); - 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; + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + return r; + else if (r > 0) + continue; - l = strlen(abstract); - if (l > sizeof(b->sockaddr.un.sun_path) - 1) - return -E2BIG; + r = parse_address_key(p, "host", &host); + if (r < 0) + return r; + else if (r > 0) + continue; - b->sockaddr.un.sun_family = AF_UNIX; - 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, "port", &port); + 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, "family", &family); + 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; + skip_address_key(p); + } - r = parse_address_key(&p, "host", &host); - if (r < 0) - return r; - else if (r > 0) - continue; + if (!host || !port) + return -EINVAL; - r = parse_address_key(&p, "port", &port); - if (r < 0) - return r; - else if (r > 0) - continue; + if (family) { + if (streq(family, "ipv4")) + hints.ai_family = AF_INET; + else if (streq(family, "ipv6")) + hints.ai_family = AF_INET6; + else + return -EINVAL; + } - r = parse_address_key(&p, "family", &family); - if (r < 0) - return r; - else if (r > 0) - continue; + r = getaddrinfo(host, port, &hints, &result); + if (r == EAI_SYSTEM) + return -errno; + else if (r != 0) + return -EADDRNOTAVAIL; - skip_address_key(&p); - } + memcpy(&b->sockaddr, result->ai_addr, result->ai_addrlen); + b->sockaddr_size = result->ai_addrlen; - if (!host || !port) - return -EINVAL; + freeaddrinfo(result); - zero(hints); - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_ADDRCONFIG; - - if (family) { - if (streq(family, "ipv4")) - hints.ai_family = AF_INET; - else if (streq(family, "ipv6")) - hints.ai_family = AF_INET6; - else - return -EINVAL; - } + 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 (!path) { + r = -EINVAL; + goto fail; + } - if (b->auth_timeout == 0) - b->auth_timeout = now(CLOCK_MONOTONIC) + BUS_DEFAULT_TIMEOUT; + /* Make sure there are no holes in the array, with the + * exception of argv[0] */ + for (j = 1; j < n_argv; j++) + if (!argv[j]) { + r = -EINVAL; + goto fail; + } - zero(mh); - mh.msg_iov = b->auth_iovec + b->auth_index; - mh.msg_iovlen = ELEMENTSOF(b->auth_iovec) - b->auth_index; + if (argv && argv[0] == NULL) { + argv[0] = strdup(path); + if (!argv[0]) { + r = -ENOMEM; + goto fail; + } + } - k = sendmsg(b->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL); - if (k < 0) - return errno == EAGAIN ? 0 : -errno; + b->exec_path = path; + b->exec_argv = argv; + return 0; - iovec_advance(b->auth_iovec, &b->auth_index, (size_t) k); +fail: + for (j = 0; j < n_argv; j++) + free(argv[j]); - return 1; + free(argv); + free(path); + return r; } -static int bus_auth_verify(sd_bus *b) { - char *e, *f; - sd_id128_t peer; - unsigned i; +static int parse_kernel_address(sd_bus *b, const char **p, char **guid) { + _cleanup_free_ char *path = NULL; int r; - /* We expect two response lines: "OK", "AGREE_UNIX_FD", and - * that's it */ - - e = memmem(b->rbuffer, b->rbuffer_size, "\r\n", 2); - if (!e) - return 0; + assert(b); + assert(p); + assert(*p); + assert(guid); - f = memmem(e + 2, b->rbuffer_size - (e - (char*) b->rbuffer) - 2, "\r\n", 2); - if (!f) - return 0; + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + return r; + else if (r > 0) + continue; - if (e - (char*) b->rbuffer != 3 + 32) - return -EPERM; + r = parse_address_key(p, "path", &path); + if (r < 0) + return r; + else if (r > 0) + continue; - if (memcmp(b->rbuffer, "OK ", 3)) - return -EPERM; + skip_address_key(p); + } - for (i = 0; i < 32; i += 2) { - int x, y; + if (!path) + return -EINVAL; - x = unhexchar(((char*) b->rbuffer)[3 + i]); - y = unhexchar(((char*) b->rbuffer)[3 + i + 1]); + free(b->kernel); + b->kernel = path; + path = NULL; - if (x < 0 || y < 0) - return -EINVAL; + return 0; +} - peer.bytes[i/2] = ((uint8_t) x << 4 | (uint8_t) y); - } +static void bus_reset_parsed_address(sd_bus *b) { + assert(b); - if (!sd_id128_equal(b->peer, SD_ID128_NULL) && - !sd_id128_equal(b->peer, peer)) - return -EPERM; - - b->peer = peer; - - b->can_fds = - (f - e == sizeof("\r\nAGREE_UNIX_FD") - 1) && - memcmp(e + 2, "AGREE_UNIX_FD", sizeof("AGREE_UNIX_FD") - 1) == 0; - - b->rbuffer_size -= (f + 2 - (char*) b->rbuffer); - memmove(b->rbuffer, f + 2, b->rbuffer_size); - - r = bus_start_running(b); - if (r < 0) - return r; - - 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 (!b->address) + return 0; + if (b->address[b->address_index] == 0) + return 0; - if (n > BUS_AUTH_SIZE_MAX) - n = BUS_AUTH_SIZE_MAX; + bus_reset_parsed_address(b); - if (b->rbuffer_size >= n) - return -ENOBUFS; + a = b->address + b->address_index; - p = realloc(b->rbuffer, n); - if (!p) - return -ENOMEM; + while (*a != 0) { - b->rbuffer = p; + if (*a == ';') { + a++; + continue; + } - zero(iov); - iov.iov_base = (uint8_t*) b->rbuffer + b->rbuffer_size; - iov.iov_len = n - b->rbuffer_size; + if (startswith(a, "unix:")) { + a += 5; - zero(mh); - mh.msg_iov = &iov; - mh.msg_iovlen = 1; + r = parse_unix_address(b, &a, &guid); + if (r < 0) + return r; + break; - k = recvmsg(b->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL); - if (k < 0) - return errno == EAGAIN ? 0 : -errno; + } else if (startswith(a, "tcp:")) { - b->rbuffer_size += k; + a += 4; + r = parse_tcp_address(b, &a, &guid); + if (r < 0) + return r; - r = bus_auth_verify(b); - if (r != 0) - return r; + break; - return 1; -} + } else if (startswith(a, "unixexec:")) { -static int bus_start_auth(sd_bus *b) { - static const char auth_prefix[] = "\0AUTH EXTERNAL "; - static const char auth_suffix[] = "\r\nNEGOTIATE_UNIX_FD\r\nBEGIN\r\n"; + a += 9; + r = parse_exec_address(b, &a, &guid); + if (r < 0) + return r; - char text[20 + 1]; /* enough space for a 64bit integer plus NUL */ - size_t l; + break; - assert(b); + } else if (startswith(a, "kernel:")) { - b->state = BUS_AUTHENTICATING; + a += 7; + r = parse_kernel_address(b, &a, &guid); + if (r < 0) + return r; - snprintf(text, sizeof(text), "%llu", (unsigned long long) geteuid()); - char_array_0(text); + break; + } - l = strlen(text); - b->auth_uid = hexmem(text, l); - if (!b->auth_uid) - return -ENOMEM; + 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 = sizeof(auth_suffix) -1; - 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) + sd_bus_close(b); + + if (b->sockaddr.sa.sa_family != AF_UNSPEC) { + + r = bus_socket_connect(b); + if (r >= 0) return r; - if (r == 0) - return b->last_connect_error ? -b->last_connect_error : -ECONNREFUSED; - } - b->fd = socket(b->sockaddr.sa.sa_family, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); - if (b->fd < 0) { - b->last_connect_error = errno; - zero(b->sockaddr); - continue; - } + b->last_connect_error = -r; - r = connect(b->fd, &b->sockaddr.sa, b->sockaddr_size); - if (r < 0) { - if (errno == EINPROGRESS) - return 1; + } else if (b->exec_path) { - b->last_connect_error = errno; - close_nointr_nofail(b->fd); - b->fd = -1; - zero(b->sockaddr); - continue; + r = bus_socket_exec(b); + if (r >= 0) + return r; + + b->last_connect_error = -r; + } else if (b->kernel) { + + r = bus_kernel_connect(b); + if (r >= 0) + return r; + + b->last_connect_error = -r; } - return bus_start_auth(b); + r = bus_parse_next_address(b); + if (r < 0) + return r; + if (r == 0) + return b->last_connect_error ? -b->last_connect_error : -ECONNREFUSED; } } -int sd_bus_open_system(sd_bus **ret) { - const char *e; - sd_bus *b; +int bus_next_address(sd_bus *b) { + assert(b); + + bus_reset_parsed_address(b); + return bus_start_address(b); +} + +static int bus_start_fd(sd_bus *b) { + struct stat st; int r; - if (!ret) - return -EINVAL; + assert(b); + assert(b->input_fd >= 0); + assert(b->output_fd >= 0); - e = getenv("DBUS_SYSTEM_BUS_ADDRESS"); - if (e) { - r = sd_bus_open_address(e, &b); + r = fd_nonblock(b->input_fd, true); + if (r < 0) + return r; + + r = fd_cloexec(b->input_fd, true); + if (r < 0) + return r; + + if (b->input_fd != b->output_fd) { + r = fd_nonblock(b->output_fd, true); if (r < 0) return r; - } else { - b = bus_new(); - if (!b) - return -ENOMEM; - - b->sockaddr.un.sun_family = AF_UNIX; - strncpy(b->sockaddr.un.sun_path, "/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path)); - b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + sizeof("/run/dbus/system_bus_socket") - 1; - r = bus_start_connect(b); - if (r < 0) { - bus_free(b); + r = fd_cloexec(b->output_fd, true); + if (r < 0) return r; - } } - r = bus_send_hello(b); - if (r < 0) { - sd_bus_unref(b); - return r; - } + if (fstat(b->input_fd, &st) < 0) + return -errno; - *ret = b; - return 0; + if (S_ISCHR(b->input_fd)) + return bus_kernel_take_fd(b); + else + return bus_socket_take_fd(b); } -int sd_bus_open_user(sd_bus **ret) { - const char *e; - sd_bus *b; - size_t l; +int sd_bus_start(sd_bus *bus) { int r; - if (!ret) + if (!bus) return -EINVAL; + if (bus->state != BUS_UNSET) + return -EPERM; - e = getenv("DBUS_SESSION_BUS_ADDRESS"); - if (e) { - r = sd_bus_open_address(e, &b); - if (r < 0) - return r; - } else { - e = getenv("XDG_RUNTIME_DIR"); - if (!e) - return -ENOENT; - - l = strlen(e); - if (l + 4 > sizeof(b->sockaddr.un.sun_path)) - return -E2BIG; - - b = bus_new(); - if (!b) - return -ENOMEM; + bus->state = BUS_OPENING; - b->sockaddr.un.sun_family = AF_UNIX; - memcpy(mempcpy(b->sockaddr.un.sun_path, e, l), "/bus", 4); - b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + l + 4; + if (bus->is_server && bus->bus_client) + return -EINVAL; - r = bus_start_connect(b); - if (r < 0) { - bus_free(b); - return r; - } - } + if (bus->input_fd >= 0) + r = bus_start_fd(bus); + else if (bus->address || bus->sockaddr.sa.sa_family != AF_UNSPEC || bus->exec_path || bus->kernel) + r = bus_start_address(bus); + else + return -EINVAL; - r = bus_send_hello(b); - if (r < 0) { - sd_bus_unref(b); + if (r < 0) return r; - } - *ret = b; - return 0; + return bus_send_hello(bus); } -int sd_bus_open_address(const char *address, sd_bus **ret) { +int sd_bus_open_system(sd_bus **ret) { + const char *e; sd_bus *b; int r; - if (!address) - return -EINVAL; if (!ret) return -EINVAL; - b = bus_new(); - if (!b) - return -ENOMEM; + r = sd_bus_new(&b); + if (r < 0) + return r; - b->address = strdup(address); - if (!b->address) { - bus_free(b); - return -ENOMEM; + e = secure_getenv("DBUS_SYSTEM_BUS_ADDRESS"); + if (e) { + r = sd_bus_set_address(b, e); + if (r < 0) + goto fail; + } else { + b->sockaddr.un.sun_family = AF_UNIX; + strncpy(b->sockaddr.un.sun_path, "/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path)); + b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + sizeof("/run/dbus/system_bus_socket") - 1; } - r = bus_start_connect(b); - if (r < 0) { - bus_free(b); - return r; - } + b->bus_client = true; + + r = sd_bus_start(b); + if (r < 0) + goto fail; *ret = b; return 0; + +fail: + bus_free(b); + return r; } -int sd_bus_open_fd(int fd, sd_bus **ret) { +int sd_bus_open_user(sd_bus **ret) { + const char *e; sd_bus *b; + size_t l; int r; - if (fd < 0) - return -EINVAL; if (!ret) return -EINVAL; - b = bus_new(); - if (!b) - return -ENOMEM; + r = sd_bus_new(&b); + if (r < 0) + return r; + + e = secure_getenv("DBUS_SESSION_BUS_ADDRESS"); + if (e) { + r = sd_bus_set_address(b, e); + if (r < 0) + goto fail; + } else { + e = secure_getenv("XDG_RUNTIME_DIR"); + if (!e) { + r = -ENOENT; + goto fail; + } - b->fd = fd; - fd_nonblock(b->fd, true); - fd_cloexec(b->fd, true); + l = strlen(e); + if (l + 4 > sizeof(b->sockaddr.un.sun_path)) { + r = -E2BIG; + goto fail; + } - r = bus_start_auth(b); - if (r < 0) { - bus_free(b); - return r; + b->sockaddr.un.sun_family = AF_UNIX; + memcpy(mempcpy(b->sockaddr.un.sun_path, e, l), "/bus", 4); + b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + l + 4; } + b->bus_client = true; + + r = sd_bus_start(b); + if (r < 0) + goto fail; + *ret = b; return 0; + +fail: + bus_free(b); + return r; } void sd_bus_close(sd_bus *bus) { if (!bus) return; - if (bus->fd < 0) + + if (bus->state != BUS_CLOSED) return; - close_nointr_nofail(bus->fd); - bus->fd = -1; + bus->state = BUS_CLOSED; + + 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; } @@ -763,10 +966,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; @@ -776,7 +976,7 @@ int sd_bus_is_open(sd_bus *bus) { if (!bus) return -EINVAL; - return bus->fd >= 0; + return BUS_IS_OPEN(bus->state); } int sd_bus_can_send(sd_bus *bus, char type) { @@ -784,9 +984,14 @@ int sd_bus_can_send(sd_bus *bus, char type) { if (!bus) return -EINVAL; + if (bus->state == BUS_UNSET) + return -ENOTCONN; if (type == SD_BUS_TYPE_UNIX_FD) { - r = ensure_running(bus); + if (!bus->negotiate_fds) + return 0; + + r = bus_ensure_running(bus); if (r < 0) return r; @@ -796,19 +1001,19 @@ 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; - r = ensure_running(bus); + r = bus_ensure_running(bus); if (r < 0) return r; - *peer = bus->peer; + *server_id = bus->server_id; return 0; } @@ -824,191 +1029,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; - - n = m->n_iovec * sizeof(struct iovec); - iov = alloca(n); - memcpy(iov, m->iovec, n); - - j = 0; - iovec_advance(iov, &j, *idx); - - zero(mh); - mh.msg_iov = iov; - mh.msg_iovlen = m->n_iovec; - - 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 = NULL; - 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) { - free(t); - return -ENOMEM; - } - } - - r = bus_message_from_malloc(bus->rbuffer, size, &t); - if (r < 0) { - free(b); - return r; - } - - bus->rbuffer = b; - bus->rbuffer_size -= size; - - *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; - - 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; - - k = recvmsg(bus->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL); - if (k < 0) - return errno == EAGAIN ? 0 : -errno; - - bus->rbuffer_size += k; - - 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. * @@ -1032,16 +1072,13 @@ static int dispatch_wqueue(sd_bus *bus) { } static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) { - sd_bus_message *z; + sd_bus_message *z = NULL; int r, ret = 0; assert(bus); 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 */ @@ -1053,7 +1090,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; @@ -1073,11 +1114,19 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { if (!bus) return -EINVAL; - if (bus->fd < 0) + if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; if (!m) return -EINVAL; + if (m->n_fds > 0) { + r = sd_bus_can_send(bus, SD_BUS_TYPE_UNIX_FD); + if (r < 0) + return r; + if (r == 0) + return -ENOTSUP; + } + /* If the serial number isn't kept, then we know that no reply * is expected */ if (!serial && !m->sealed) @@ -1095,11 +1144,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 @@ -1162,7 +1215,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) { @@ -1172,7 +1225,7 @@ int sd_bus_send_with_reply( if (!bus) return -EINVAL; - if (bus->fd < 0) + if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; if (!m) return -EINVAL; @@ -1197,7 +1250,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; @@ -1249,11 +1302,13 @@ int sd_bus_send_with_reply_cancel(sd_bus *bus, uint64_t serial) { return 1; } -static int ensure_running(sd_bus *bus) { +int bus_ensure_running(sd_bus *bus) { int r; assert(bus); + if (bus->state == BUS_UNSET || bus->state == BUS_CLOSED) + return -ENOTCONN; if (bus->state == BUS_RUNNING) return 1; @@ -1286,7 +1341,7 @@ int sd_bus_send_with_reply_and_block( if (!bus) return -EINVAL; - if (bus->fd < 0) + if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; if (!m) return -EINVAL; @@ -1297,7 +1352,7 @@ int sd_bus_send_with_reply_and_block( if (bus_error_is_dirty(error)) return -EINVAL; - r = ensure_running(bus); + r = bus_ensure_running(bus); if (r < 0) return r; @@ -1328,7 +1383,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) { @@ -1337,7 +1395,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; } @@ -1394,11 +1457,12 @@ 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; - return bus->fd; + return bus->input_fd; } int sd_bus_get_events(sd_bus *bus) { @@ -1406,14 +1470,14 @@ int sd_bus_get_events(sd_bus *bus) { if (!bus) return -EINVAL; - if (bus->fd < 0) + if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; 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; @@ -1435,7 +1499,7 @@ int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) { return -EINVAL; if (!timeout_usec) return -EINVAL; - if (bus->fd < 0) + if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; if (bus->state == BUS_AUTHENTICATING) { @@ -1443,19 +1507,23 @@ int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) { 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 *reply = NULL; + _cleanup_bus_message_unref_ sd_bus_message* m = NULL; struct reply_callback *c; usec_t n; int r; @@ -1470,15 +1538,127 @@ 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; + + assert(bus); + assert(m); + + if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_RETURN && + m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_ERROR) + return 0; + + c = hashmap_remove(bus->reply_callbacks, &m->reply_serial); + if (!c) + return 0; + + if (c->timeout != 0) + prioq_remove(bus->reply_callbacks_prioq, c, &c->prioq_idx); + + r = sd_bus_message_rewind(m, true); + if (r < 0) + return r; + + r = c->callback(bus, m, c->userdata); + free(c); + + return r; +} + +static int process_filter(sd_bus *bus, sd_bus_message *m) { + struct filter_callback *l; + int r; + + 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; +} + static int process_builtin(sd_bus *bus, sd_bus_message *m) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; int r; @@ -1511,7 +1691,7 @@ 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; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; sd_bus_error_set(&error, "org.freedesktop.DBus.Error.UnknownMethod", @@ -1530,149 +1710,274 @@ static int process_builtin(sd_bus *bus, sd_bus_message *m) { return 1; } -static int process_message(sd_bus *bus, sd_bus_message *m) { - struct filter_callback *l; +static int process_object(sd_bus *bus, sd_bus_message *m) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + struct object_callback *c; int r; + bool found = false; + size_t pl; assert(bus); assert(m); - if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_RETURN || m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_ERROR) { - struct reply_callback *c; + if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) + return 0; + + if (hashmap_isempty(bus->object_callbacks)) + return 0; + + pl = strlen(m->path); + + do { + char p[pl+1]; - c = hashmap_remove(bus->reply_callbacks, &m->reply_serial); - if (c) { - if (c->timeout != 0) - prioq_remove(bus->reply_callbacks_prioq, c, &c->prioq_idx); + bus->object_callbacks_modified = false; - r = c->callback(bus, 0, m, c->userdata); - free(c); + c = hashmap_get(bus->object_callbacks, m->path); + if (c && c->last_iteration != bus->iteration_counter) { + c->last_iteration = bus->iteration_counter; + + r = sd_bus_message_rewind(m, true); + if (r < 0) + return r; + + r = c->callback(bus, m, c->userdata); if (r != 0) return r; + + found = true; } - } - LIST_FOREACH(callbacks, l, bus->filter_callbacks) { - r = l->callback(bus, 0, m, l->userdata); - if (r != 0) + /* Look for fallback prefixes */ + strcpy(p, m->path); + for (;;) { + char *e; + + if (bus->object_callbacks_modified) + break; + + e = strrchr(p, '/'); + if (e == p || !e) + break; + + *e = 0; + + c = hashmap_get(bus->object_callbacks, p); + if (c && c->last_iteration != bus->iteration_counter && c->is_fallback) { + + c->last_iteration = bus->iteration_counter; + + r = sd_bus_message_rewind(m, true); + if (r < 0) + return r; + + r = c->callback(bus, m, c->userdata); + if (r != 0) + return r; + + found = true; + } + } + + } while (bus->object_callbacks_modified); + + /* We found some handlers but none wanted to take this, then + * return this -- with one exception, we can handle + * introspection minimally ourselves */ + if (!found || sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) + return 0; + + sd_bus_error_set(&error, + "org.freedesktop.DBus.Error.UnknownMethod", + "Unknown method '%s' or interface '%s'.", m->member, m->interface); + + r = sd_bus_message_new_method_error(bus, m, &error, &reply); + if (r < 0) + return r; + + r = sd_bus_send(bus, reply, NULL); + if (r < 0) + return r; + + return 1; +} + +static int process_introspect(sd_bus *bus, sd_bus_message *m) { + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_free_ char *introspection = NULL; + _cleanup_set_free_free_ Set *s = NULL; + _cleanup_fclose_ FILE *f = NULL; + struct object_callback *c; + Iterator i; + size_t size = 0; + char *node; + int r; + + assert(bus); + assert(m); + + if (!sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) + return 0; + + if (!m->path) + return 0; + + s = set_new(string_hash_func, string_compare_func); + if (!s) + return -ENOMEM; + + HASHMAP_FOREACH(c, bus->object_callbacks, i) { + const char *e; + char *a, *p; + + if (streq(c->path, "/")) + continue; + + if (streq(m->path, "/")) + e = c->path; + else { + e = startswith(c->path, m->path); + if (!e || *e != '/') + continue; + } + + a = strdup(e+1); + if (!a) + return -ENOMEM; + + p = strchr(a, '/'); + if (p) + *p = 0; + + r = set_consume(s, a); + if (r < 0 && r != -EEXIST) return r; } - return process_builtin(bus, m); + f = open_memstream(&introspection, &size); + if (!f) + return -ENOMEM; + + fputs(SD_BUS_INTROSPECT_DOCTYPE, f); + fputs("\n", f); + fputs(SD_BUS_INTROSPECT_INTERFACE_PEER, f); + fputs(SD_BUS_INTROSPECT_INTERFACE_INTROSPECTABLE, f); + + while ((node = set_steal_first(s))) { + fprintf(f, " \n", node); + free(node); + } + + fputs("\n", f); + + fflush(f); + + if (ferror(f)) + return -ENOMEM; + + r = sd_bus_message_new_method_return(bus, m, &reply); + if (r < 0) + return r; + + r = sd_bus_message_append(reply, "s", introspection); + if (r < 0) + return r; + + r = sd_bus_send(bus, reply, NULL); + if (r < 0) + return r; + + return 1; } -int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { +static int process_message(sd_bus *bus, sd_bus_message *m) { 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->fd < 0) - return -ENOTCONN; + assert(bus); + assert(m); - if (bus->state == BUS_OPENING) { - struct pollfd p; + bus->iteration_counter++; - zero(p); - p.fd = bus->fd; - p.events = POLLOUT; + r = process_hello(bus, m); + if (r != 0) + return r; - r = poll(&p, 1, 0); - if (r < 0) - return -errno; + r = process_reply(bus, m); + if (r != 0) + return r; - if (p.revents & (POLLOUT|POLLERR|POLLHUP)) { - int error = 0; - socklen_t slen = sizeof(error); + r = process_filter(bus, m); + if (r != 0) + return r; - 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; - } + r = process_match(bus, m); + if (r != 0) + return r; - /* Try next address */ - r = bus_start_connect(bus); - goto null_message; - } + r = process_builtin(bus, m); + if (r != 0) + return r; - r = 0; - goto null_message; + r = process_object(bus, m); + if (r != 0) + return r; - } else if (bus->state == BUS_AUTHENTICATING) { + return process_introspect(bus, m); +} - if (now(CLOCK_MONOTONIC) >= bus->auth_timeout) - return -ETIMEDOUT; +static int process_running(sd_bus *bus, sd_bus_message **ret) { + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + int r; - r = bus_write_auth(bus); - if (r != 0) - goto null_message; + assert(bus); + assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - r = bus_read_auth(bus); + r = process_timeout(bus); + if (r != 0) goto null_message; - } else if (bus->state == BUS_RUNNING || bus->state == BUS_HELLO) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL; - int k; + r = dispatch_wqueue(bus); + if (r != 0) + goto null_message; - r = process_timeout(bus); - if (r != 0) - goto null_message; + r = dispatch_rqueue(bus, &m); + if (r < 0) + return r; + if (!m) + goto null_message; - r = dispatch_wqueue(bus); - if (r != 0) - goto null_message; + r = process_message(bus, m); + if (r != 0) + goto null_message; - k = r; - r = dispatch_rqueue(bus, &m); + if (ret) { + 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); - 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; + *ret = m; + m = NULL; + return 1; + } - sd_bus_error_set(&error, "org.freedesktop.DBus.Error.UnknownObject", "Unknown object '%s'.", m->path); + if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL) { + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - r = sd_bus_message_new_method_error(bus, m, &error, &reply); - if (r < 0) - return r; + sd_bus_error_set(&error, "org.freedesktop.DBus.Error.UnknownObject", "Unknown object '%s'.", m->path); - r = sd_bus_send(bus, reply, NULL); - if (r < 0) - return r; - } + r = sd_bus_message_new_method_error(bus, m, &error, &reply); + if (r < 0) + return r; - return 1; + r = sd_bus_send(bus, reply, NULL); + if (r < 0) + return r; } - assert_not_reached("Unknown state"); + return 1; null_message: if (r >= 0 && ret) @@ -1681,15 +1986,66 @@ null_message: 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; + + /* 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; - int r, e; + struct pollfd p[2] = {}; + int r, e, n; struct timespec ts; usec_t until, m; assert(bus); - if (bus->fd < 0) + if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; e = sd_bus_get_events(bus); @@ -1705,19 +2061,26 @@ static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) { if (r == 0) m = (uint64_t) -1; else { - usec_t n; - n = now(CLOCK_MONOTONIC); - m = until > n ? until - n : 0; + usec_t nw; + nw = now(CLOCK_MONOTONIC); + m = until > nw ? until - nw : 0; } if (timeout_usec != (uint64_t) -1 && (m == (uint64_t) -1 || timeout_usec < m)) m = timeout_usec; - zero(p); - p.fd = bus->fd; - p.events = e; + 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, 1, m == (uint64_t) -1 ? NULL : timespec_store(&ts, m), NULL); + r = ppoll(p, n, m == (uint64_t) -1 ? NULL : timespec_store(&ts, m), NULL); if (r < 0) return -errno; @@ -1728,7 +2091,7 @@ int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) { if (!bus) return -EINVAL; - if (bus->fd < 0) + if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; if (bus->rqueue_size > 0) return 0; @@ -1741,10 +2104,10 @@ int sd_bus_flush(sd_bus *bus) { if (!bus) return -EINVAL; - if (bus->fd < 0) + if (!BUS_IS_OPEN(bus->state)) return -ENOTCONN; - r = ensure_running(bus); + r = bus_ensure_running(bus); if (r < 0) return r; @@ -1765,7 +2128,7 @@ int sd_bus_flush(sd_bus *bus) { } } -int sd_bus_add_filter(sd_bus *bus, sd_message_handler_t callback, void *userdata) { +int sd_bus_add_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata) { struct filter_callback *f; if (!bus) @@ -1773,17 +2136,18 @@ int sd_bus_add_filter(sd_bus *bus, sd_message_handler_t callback, void *userdata if (!callback) return -EINVAL; - f = new(struct filter_callback, 1); + 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_message_handler_t callback, void *userdata) { +int sd_bus_remove_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata) { struct filter_callback *f; if (!bus) @@ -1793,6 +2157,7 @@ int sd_bus_remove_filter(sd_bus *bus, sd_message_handler_t callback, void *userd 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; @@ -1801,3 +2166,265 @@ int sd_bus_remove_filter(sd_bus *bus, sd_message_handler_t callback, void *userd return 0; } + +static int bus_add_object( + sd_bus *bus, + bool fallback, + const char *path, + sd_bus_message_handler_t callback, + void *userdata) { + + struct object_callback *c; + int r; + + if (!bus) + return -EINVAL; + if (!path) + return -EINVAL; + if (!callback) + return -EINVAL; + + r = hashmap_ensure_allocated(&bus->object_callbacks, string_hash_func, string_compare_func); + if (r < 0) + return r; + + c = new0(struct object_callback, 1); + if (!c) + return -ENOMEM; + + c->path = strdup(path); + if (!c->path) { + free(c); + return -ENOMEM; + } + + c->callback = callback; + c->userdata = userdata; + c->is_fallback = fallback; + + bus->object_callbacks_modified = true; + r = hashmap_put(bus->object_callbacks, c->path, c); + if (r < 0) { + free(c->path); + free(c); + return r; + } + + return 0; +} + +static int bus_remove_object( + sd_bus *bus, + bool fallback, + const char *path, + sd_bus_message_handler_t callback, + void *userdata) { + + struct object_callback *c; + + if (!bus) + return -EINVAL; + if (!path) + return -EINVAL; + if (!callback) + return -EINVAL; + + c = hashmap_get(bus->object_callbacks, path); + if (!c) + return 0; + + if (c->callback != callback || c->userdata != userdata || c->is_fallback != fallback) + return 0; + + bus->object_callbacks_modified = true; + assert_se(c == hashmap_remove(bus->object_callbacks, c->path)); + + free(c->path); + free(c); + + 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) { + int r = 0; + + if (!bus) + return -EINVAL; + if (!match) + return -EINVAL; + + if (bus->bus_client) { + r = bus_add_match_internal(bus, match); + if (r < 0) + return r; + } + + if (callback) { + bus->match_callbacks_modified = true; + r = bus_match_add(&bus->match_callbacks, match, callback, userdata, NULL); + if (r < 0) { + + if (bus->bus_client) + bus_remove_match_internal(bus, match); + } + } + + return r; +} + +int sd_bus_remove_match(sd_bus *bus, const char *match, sd_bus_message_handler_t callback, void *userdata) { + int r = 0, q = 0; + + if (!bus) + return -EINVAL; + if (!match) + return -EINVAL; + + if (bus->bus_client) + r = bus_remove_match_internal(bus, match); + + if (callback) { + bus->match_callbacks_modified = true; + q = bus_match_remove(&bus->match_callbacks, match, callback, userdata); + } + + if (r < 0) + return r; + return 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; + + 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; + + 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 (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 (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); +}