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=9408806a4e85bfa1df00f35b1a5cb099fa4b3e3d;hp=d0a36081bcf080cbaaa2b316bc37b2e059dc584d;hb=2bf938c1913b2ba9644cc113de8dc30dd10abbd4;hpb=e3017af97310da024ffb378ed155bc1676922ce7 diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index d0a36081b..9408806a4 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -35,8 +35,7 @@ #include "bus-message.h" #include "bus-type.h" -#define WQUEUE_MAX 128 - +static int ensure_running(sd_bus *bus); static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec); static void bus_free(sd_bus *b) { @@ -105,16 +104,19 @@ static int hello_callback(sd_bus *bus, int error, sd_bus_message *reply, void *u assert(reply); - bus->state = BUS_RUNNING; - 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; } @@ -495,6 +497,13 @@ static int bus_read_auth(sd_bus *b) { 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; @@ -773,27 +782,37 @@ int sd_bus_is_open(sd_bus *bus) { return bus->fd >= 0; } -int sd_bus_is_running(sd_bus *bus) { +int sd_bus_can_send(sd_bus *bus, char type) { + int r; + if (!bus) return -EINVAL; - if (bus->fd < 0) - return -ENOTCONN; + if (type == SD_BUS_TYPE_UNIX_FD) { + r = ensure_running(bus); + if (r < 0) + return r; + + return bus->can_fds; + } - return bus->state == BUS_RUNNING; + return bus_type_is_valid(type); } -int sd_bus_can_send(sd_bus *bus, char type) { +int sd_bus_get_peer(sd_bus *bus, sd_id128_t *peer) { + int r; if (!bus) return -EINVAL; - if (bus->state != BUS_RUNNING && bus->state != BUS_HELLO) - return -EAGAIN; + if (!peer) + return -EINVAL; - if (type == SD_BUS_TYPE_UNIX_FD) - return bus->can_fds; + r = ensure_running(bus); + if (r < 0) + return r; - return bus_type_is_valid(type); + *peer = bus->peer; + return 0; } static int bus_seal_message(sd_bus *b, sd_bus_message *m) { @@ -845,6 +864,7 @@ static int message_write(sd_bus *bus, sd_bus_message *m, size_t *idx) { 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); @@ -885,7 +905,11 @@ static int message_read_need(sd_bus *bus, size_t *need) { } else return -EBADMSG; - *need = sizeof(struct bus_header) + ALIGN_TO(b, 8) + a; + 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; } @@ -1011,7 +1035,7 @@ 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); @@ -1057,6 +1081,11 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { if (!m) return -EINVAL; + /* If the serial number isn't kept, then we know that no reply + * is expected */ + if (!serial && !m->sealed) + m->header->flags |= SD_BUS_MESSAGE_NO_REPLY_EXPECTED; + r = bus_seal_message(bus, m); if (r < 0) return r; @@ -1088,7 +1117,7 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { /* Just append it to the queue. */ - if (bus->wqueue_size >= WQUEUE_MAX) + if (bus->wqueue_size >= BUS_WQUEUE_MAX) return -ENOBUFS; q = realloc(bus->wqueue, sizeof(sd_bus_message*) * (bus->wqueue_size + 1)); @@ -1228,22 +1257,15 @@ static int ensure_running(sd_bus *bus) { assert(bus); - r = sd_bus_is_running(bus); - if (r != 0) - return r; + if (bus->state == BUS_RUNNING) + return 1; for (;;) { - int k; - r = sd_bus_process(bus, NULL); - if (r < 0) return r; - - k = sd_bus_is_running(bus); - if (k != 0) - return k; - + if (bus->state == BUS_RUNNING) + return 1; if (r > 0) continue; @@ -1295,6 +1317,9 @@ int sd_bus_send_with_reply_and_block( if (!room) { sd_bus_message **q; + if (bus->rqueue_size >= BUS_RQUEUE_MAX) + return -ENOBUFS; + /* Make sure there's room for queuing this * locally, before we read the message */ @@ -1457,6 +1482,57 @@ static int process_timeout(sd_bus *bus) { return r < 0 ? r : 1; } +static int process_builtin(sd_bus *bus, sd_bus_message *m) { + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + int r; + + assert(bus); + assert(m); + + if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL) + return 0; + + if (!streq_ptr(m->interface, "org.freedesktop.DBus.Peer")) + return 0; + + if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) + return 1; + + if (streq_ptr(m->member, "Ping")) + r = sd_bus_message_new_method_return(bus, m, &reply); + else if (streq_ptr(m->member, "GetMachineId")) { + sd_id128_t id; + char sid[33]; + + r = sd_id128_get_machine(&id); + if (r < 0) + return r; + + r = sd_bus_message_new_method_return(bus, m, &reply); + if (r < 0) + return r; + + r = sd_bus_message_append(reply, "s", sd_id128_to_string(id, sid)); + } else { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_INIT; + + sd_bus_error_set(&error, + "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) + return r; + + r = sd_bus_send(bus, reply, NULL); + if (r < 0) + return r; + + return 1; +} + static int process_message(sd_bus *bus, sd_bus_message *m) { struct filter_callback *l; int r; @@ -1464,7 +1540,7 @@ static int process_message(sd_bus *bus, sd_bus_message *m) { assert(bus); assert(m); - if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL || m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_RETURN) { + if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_RETURN || m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_ERROR) { struct reply_callback *c; c = hashmap_remove(bus->reply_callbacks, &m->reply_serial); @@ -1486,7 +1562,7 @@ static int process_message(sd_bus *bus, sd_bus_message *m) { return r; } - return 0; + return process_builtin(bus, m); } int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { @@ -1581,11 +1657,13 @@ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) { return 1; } - if (sd_bus_message_is_method_call(m, NULL, NULL)) { - const sd_bus_error e = SD_BUS_ERROR_INIT_CONST("org.freedesktop.DBus.Error.UnknownObject", "Unknown object."); + 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, &e, &reply); + r = sd_bus_message_new_method_error(bus, m, &error, &reply); if (r < 0) return r;