X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fsd-bus.c;h=3a4821319e49c61de056abf73374cc06573f0f0b;hp=932bf226c58509a9e07963873d22c4fcf94de66f;hb=4cdf07519a9582afa9d2deeb6d9f54597b8268a1;hpb=6d6f4904aaa5047370949093cd63d0fc2a4a83b8 diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index 932bf226c..3a4821319 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -118,6 +118,7 @@ static void bus_reset_queues(sd_bus *b) { free(b->wqueue); b->rqueue = b->wqueue = NULL; + b->rqueue_allocated = b->wqueue_allocated = 0; b->rqueue_size = b->wqueue_size = 0; } @@ -140,6 +141,8 @@ static void bus_free(sd_bus *b) { free(b->address); free(b->kernel); free(b->machine); + free(b->fake_label); + free(b->cgroup_root); free(b->exec_path); strv_free(b->exec_argv); @@ -195,8 +198,7 @@ _public_ int sd_bus_new(sd_bus **ret) { /* We guarantee that wqueue always has space for at least one * entry */ - r->wqueue = new(sd_bus_message*, 1); - if (!r->wqueue) { + if (!GREEDY_REALLOC(r->wqueue, r->wqueue_allocated, 1)) { free(r); return -ENOMEM; } @@ -374,7 +376,7 @@ static int bus_send_hello(sd_bus *bus) { r = sd_bus_message_new_method_call( bus, "org.freedesktop.DBus", - "/", + "/org/freedesktop/DBus", "org.freedesktop.DBus", "Hello", &m); @@ -397,7 +399,7 @@ int bus_start_running(sd_bus *bus) { } static int parse_address_key(const char **p, const char *key, char **value) { - size_t l, n = 0; + size_t l, n = 0, allocated = 0; const char *a; char *r = NULL; @@ -421,7 +423,7 @@ static int parse_address_key(const char **p, const char *key, char **value) { a = *p; while (*a != ';' && *a != ',' && *a != 0) { - char c, *t; + char c; if (*a == '%') { int x, y; @@ -445,13 +447,9 @@ static int parse_address_key(const char **p, const char *key, char **value) { a++; } - t = realloc(r, n + 2); - if (!t) { - free(r); + if (!GREEDY_REALLOC(r, allocated, n + 2)) return -ENOMEM; - } - r = t; r[n++] = c; } @@ -614,6 +612,7 @@ static int parse_exec_address(sd_bus *b, const char **p, char **guid) { char *path = NULL; unsigned n_argv = 0, j; char **argv = NULL; + size_t allocated = 0; int r; assert(b); @@ -647,17 +646,11 @@ static int parse_exec_address(sd_bus *b, const char **p, char **guid) { (*p) ++; if (ul >= n_argv) { - char **x; - - x = realloc(argv, sizeof(char*) * (ul + 2)); - if (!x) { + if (!GREEDY_REALLOC0(argv, allocated, ul + 2)) { r = -ENOMEM; goto fail; } - memset(x + n_argv, 0, sizeof(char*) * (ul - n_argv + 2)); - - argv = x; n_argv = ul + 1; } @@ -740,7 +733,7 @@ static int parse_kernel_address(sd_bus *b, const char **p, char **guid) { return 0; } -static int parse_container_address(sd_bus *b, const char **p, char **guid) { +static int parse_container_unix_address(sd_bus *b, const char **p, char **guid) { _cleanup_free_ char *machine = NULL; int r; @@ -782,6 +775,49 @@ static int parse_container_address(sd_bus *b, const char **p, char **guid) { return 0; } +static int parse_container_kernel_address(sd_bus *b, const char **p, char **guid) { + _cleanup_free_ char *machine = NULL; + int r; + + assert(b); + assert(p); + assert(*p); + assert(guid); + + while (**p != 0 && **p != ';') { + r = parse_address_key(p, "guid", guid); + if (r < 0) + return r; + else if (r > 0) + continue; + + r = parse_address_key(p, "machine", &machine); + if (r < 0) + return r; + else if (r > 0) + continue; + + skip_address_key(p); + } + + if (!machine) + return -EINVAL; + + if (!filename_is_safe(machine)) + return -EINVAL; + + free(b->machine); + b->machine = machine; + machine = NULL; + + free(b->kernel); + b->kernel = strdup("/dev/kdbus/0-system/bus"); + if (!b->kernel) + return -ENOMEM; + + return 0; +} + static void bus_reset_parsed_address(sd_bus *b) { assert(b); @@ -855,10 +891,18 @@ static int bus_parse_next_address(sd_bus *b) { return r; break; - } else if (startswith(a, "x-container:")) { + } else if (startswith(a, "x-container-unix:")) { + + a += 17; + r = parse_container_unix_address(b, &a, &guid); + if (r < 0) + return r; + + break; + } else if (startswith(a, "x-container-kernel:")) { - a += 12; - r = parse_container_address(b, &a, &guid); + a += 19; + r = parse_container_kernel_address(b, &a, &guid); if (r < 0) return r; @@ -892,10 +936,12 @@ static int bus_start_address(sd_bus *b) { if (b->exec_path) r = bus_socket_exec(b); + else if (b->machine && b->kernel) + r = bus_container_connect_kernel(b); + else if (b->machine && b->sockaddr.sa.sa_family != AF_UNSPEC) + r = bus_container_connect_socket(b); else if (b->kernel) r = bus_kernel_connect(b); - else if (b->machine) - r = bus_container_connect(b); else if (b->sockaddr.sa.sa_family != AF_UNSPEC) r = bus_socket_connect(b); else @@ -1144,9 +1190,9 @@ _public_ int sd_bus_open_system_container(const char *machine, sd_bus **ret) { return -ENOMEM; #ifdef ENABLE_KDBUS - p = strjoin("kernel:path=/dev/kdbus/ns/machine-", e, "/0-system/bus;x-container:machine=", e, NULL); + p = strjoin("x-container-kernel:machine=", e, ";x-container-unix:machine=", e, NULL); #else - p = strjoin("x-container:machine=", e, NULL); + p = strjoin("x-container-unix:machine=", e, NULL); #endif if (!p) return -ENOMEM; @@ -1275,14 +1321,6 @@ static int bus_seal_message(sd_bus *b, sd_bus_message *m, usec_t timeout) { assert(b); assert(m); - if (b->message_version != 0 && - m->header->version != b->message_version) - return -EPERM; - - if (b->message_endian != 0 && - m->header->endian != b->message_endian) - return -EPERM; - if (m->sealed) { /* If we copy the same message to multiple * destinations, avoid using the same serial @@ -1297,6 +1335,18 @@ static int bus_seal_message(sd_bus *b, sd_bus_message *m, usec_t timeout) { return bus_message_seal(m, ++b->serial, timeout); } +static int bus_remarshal_message(sd_bus *b, sd_bus_message **m) { + assert(b); + + /* Do packet version and endianess already match? */ + if ((b->message_version == 0 || b->message_version == (*m)->header->version) && + (b->message_endian == 0 || b->message_endian == (*m)->header->endian)) + return 0; + + /* No? Then remarshal! */ + return bus_message_remarshal(b, m); +} + int bus_seal_synthetic_message(sd_bus *b, sd_bus_message *m) { assert(b); assert(m); @@ -1369,24 +1419,14 @@ static int bus_read_message(sd_bus *bus) { } int bus_rqueue_make_room(sd_bus *bus) { - sd_bus_message **q; - unsigned x; - - x = bus->rqueue_size + 1; - - if (bus->rqueue_allocated >= x) - return 0; + assert(bus); - if (x > BUS_RQUEUE_MAX) + if (bus->rqueue_size >= BUS_RQUEUE_MAX) return -ENOBUFS; - q = realloc(bus->rqueue, x * sizeof(sd_bus_message*)); - if (!q) + if (!GREEDY_REALLOC(bus->rqueue, bus->rqueue_allocated, bus->rqueue_size + 1)) return -ENOMEM; - bus->rqueue = q; - bus->rqueue_allocated = x; - return 0; } @@ -1418,7 +1458,8 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) { } } -_public_ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { +_public_ int sd_bus_send(sd_bus *bus, sd_bus_message *_m, uint64_t *serial) { + _cleanup_bus_message_unref_ sd_bus_message *m = sd_bus_message_ref(_m); int r; assert_return(bus, -EINVAL); @@ -1443,6 +1484,12 @@ _public_ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { if (r < 0) return r; + /* Remarshall if we have to. This will possible unref the + * message and place a replacement in m */ + r = bus_remarshal_message(bus, &m); + if (r < 0) + return r; + /* If this is a reply and no reply was requested, then let's * suppress this, if we can */ if (m->dont_send && !serial) @@ -1468,19 +1515,15 @@ _public_ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { bus->windex = idx; } } else { - sd_bus_message **q; - /* Just append it to the queue. */ if (bus->wqueue_size >= BUS_WQUEUE_MAX) return -ENOBUFS; - q = realloc(bus->wqueue, sizeof(sd_bus_message*) * (bus->wqueue_size + 1)); - if (!q) + if (!GREEDY_REALLOC(bus->wqueue, bus->wqueue_allocated, bus->wqueue_size + 1)) return -ENOMEM; - bus->wqueue = q; - q[bus->wqueue_size ++] = sd_bus_message_ref(m); + bus->wqueue[bus->wqueue_size ++] = sd_bus_message_ref(m); } if (serial) @@ -1537,12 +1580,13 @@ static int timeout_compare(const void *a, const void *b) { _public_ int sd_bus_call_async( sd_bus *bus, - sd_bus_message *m, + sd_bus_message *_m, sd_bus_message_handler_t callback, void *userdata, uint64_t usec, uint64_t *serial) { + _cleanup_bus_message_unref_ sd_bus_message *m = sd_bus_message_ref(_m); struct reply_callback *c; int r; @@ -1566,6 +1610,10 @@ _public_ int sd_bus_call_async( if (r < 0) return r; + r = bus_remarshal_message(bus, &m); + if (r < 0) + return r; + c = new0(struct reply_callback, 1); if (!c) return -ENOMEM; @@ -1644,11 +1692,12 @@ int bus_ensure_running(sd_bus *bus) { _public_ int sd_bus_call( sd_bus *bus, - sd_bus_message *m, + sd_bus_message *_m, uint64_t usec, sd_bus_error *error, sd_bus_message **reply) { + _cleanup_bus_message_unref_ sd_bus_message *m = sd_bus_message_ref(_m); usec_t timeout; uint64_t serial; unsigned i; @@ -1672,6 +1721,10 @@ _public_ int sd_bus_call( if (r < 0) return r; + r = bus_remarshal_message(bus, &m); + if (r < 0) + return r; + r = sd_bus_send(bus, m, &serial); if (r < 0) return r; @@ -2050,11 +2103,16 @@ static int process_message(sd_bus *bus, sd_bus_message *m) { bus->current = m; bus->iteration_counter++; - log_debug("Got message sender=%s object=%s interface=%s member=%s", + log_debug("Got message type=%s sender=%s destination=%s object=%s interface=%s member=%s serial=%lu reply_serial=%lu error=%s", + bus_message_type_to_string(m->header->type), strna(sd_bus_message_get_sender(m)), + strna(sd_bus_message_get_destination(m)), strna(sd_bus_message_get_path(m)), strna(sd_bus_message_get_interface(m)), - strna(sd_bus_message_get_member(m))); + strna(sd_bus_message_get_member(m)), + (unsigned long) m->header->serial, + (unsigned long) m->reply_serial, + strna(m->error.message)); r = process_hello(bus, m); if (r != 0) @@ -2120,6 +2178,12 @@ static int process_running(sd_bus *bus, sd_bus_message **ret) { if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL) { + log_debug("Unprocessed message call sender=%s object=%s interface=%s member=%s", + strna(sd_bus_message_get_sender(m)), + strna(sd_bus_message_get_path(m)), + strna(sd_bus_message_get_interface(m)), + strna(sd_bus_message_get_member(m))); + r = sd_bus_reply_method_errorf( m, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -2762,13 +2826,13 @@ static int bus_default(int (*bus_open)(sd_bus **), sd_bus **default_bus, sd_bus } _public_ int sd_bus_default_system(sd_bus **ret) { - static __thread sd_bus *default_system_bus = NULL; + static thread_local sd_bus *default_system_bus = NULL; return bus_default(sd_bus_open_system, &default_system_bus, ret); } _public_ int sd_bus_default_user(sd_bus **ret) { - static __thread sd_bus *default_user_bus = NULL; + static thread_local sd_bus *default_user_bus = NULL; return bus_default(sd_bus_open_user, &default_user_bus, ret); } @@ -2905,3 +2969,25 @@ _public_ int sd_bus_get_peer_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **re *ret = c; return 0; } + +_public_ int sd_bus_try_close(sd_bus *bus) { + int r; + + assert_return(bus, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(!bus_pid_changed(bus), -ECHILD); + assert_return(bus->is_kernel, -ENOTSUP); + + if (bus->rqueue_size > 0) + return -EBUSY; + + if (bus->wqueue_size > 0) + return -EBUSY; + + r = bus_kernel_try_close(bus); + if (r < 0) + return r; + + sd_bus_close(bus); + return 0; +}