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=86265955bbde42508e48e6adf9acdb94846fc893;hp=2fe6340e366e7bb35f814c0db9b94767788b60fd;hb=7d22c717329c6317f97ccd0f68040a3a2b98e760;hpb=d21a7bb1a91ca4654287a69d0443629198e42e1b diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index 2fe6340e3..86265955b 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -290,33 +290,7 @@ _public_ int sd_bus_negotiate_attach_creds(sd_bus *bus, uint64_t mask) { assert_return(bus->state == BUS_UNSET, -EPERM); assert_return(!bus_pid_changed(bus), -ECHILD); - SET_FLAG(bus->attach_flags, KDBUS_ATTACH_CREDS, - !!(mask & (SD_BUS_CREDS_UID|SD_BUS_CREDS_GID|SD_BUS_CREDS_PID|SD_BUS_CREDS_PID_STARTTIME|SD_BUS_CREDS_TID))); - - SET_FLAG(bus->attach_flags, KDBUS_ATTACH_COMM, - !!(mask & (SD_BUS_CREDS_COMM|SD_BUS_CREDS_TID_COMM))); - - SET_FLAG(bus->attach_flags, KDBUS_ATTACH_EXE, - !!(mask & SD_BUS_CREDS_EXE)); - - SET_FLAG(bus->attach_flags, KDBUS_ATTACH_CMDLINE, - !!(mask & SD_BUS_CREDS_CMDLINE)); - - SET_FLAG(bus->attach_flags, KDBUS_ATTACH_CGROUP, - !!(mask & (SD_BUS_CREDS_CGROUP|SD_BUS_CREDS_UNIT|SD_BUS_CREDS_USER_UNIT|SD_BUS_CREDS_SLICE|SD_BUS_CREDS_SESSION|SD_BUS_CREDS_OWNER_UID))); - - SET_FLAG(bus->attach_flags, KDBUS_ATTACH_CAPS, - !!(mask & (SD_BUS_CREDS_EFFECTIVE_CAPS|SD_BUS_CREDS_PERMITTED_CAPS|SD_BUS_CREDS_INHERITABLE_CAPS|SD_BUS_CREDS_BOUNDING_CAPS))); - - SET_FLAG(bus->attach_flags, KDBUS_ATTACH_SECLABEL, - !!(mask & SD_BUS_CREDS_SELINUX_CONTEXT)); - - SET_FLAG(bus->attach_flags, KDBUS_ATTACH_AUDIT, - !!(mask & (SD_BUS_CREDS_AUDIT_SESSION_ID|SD_BUS_CREDS_AUDIT_LOGIN_UID))); - - bus->creds_mask = mask; - - return 0; + return kdbus_translate_attach_flags(mask, &bus->creds_mask); } _public_ int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id) { @@ -1257,7 +1231,7 @@ _public_ int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) { return 0; } -static int bus_seal_message(sd_bus *b, sd_bus_message *m) { +int bus_seal_message(sd_bus *b, sd_bus_message *m) { assert(m); if (m->header->version > b->message_version) @@ -1325,50 +1299,78 @@ static int dispatch_wqueue(sd_bus *bus) { return ret; } -static int bus_read_message(sd_bus *bus, sd_bus_message **m) { +static int bus_read_message(sd_bus *bus) { + assert(bus); + + if (bus->is_kernel) + return bus_kernel_read_message(bus); + else + return bus_socket_read_message(bus); +} + +int bus_rqueue_make_room(sd_bus *bus, unsigned n) { + sd_bus_message **q; + unsigned x; + + x = bus->rqueue_size + n; + + if (bus->rqueue_allocated >= x) + return 0; + + if (x > BUS_RQUEUE_MAX) + return -ENOBUFS; + + q = realloc(bus->rqueue, x * sizeof(sd_bus_message*)); + if (!q) + return -ENOMEM; + + bus->rqueue = q; + bus->rqueue_allocated = x; + + return 0; +} + +int bus_rqueue_push(sd_bus *bus, sd_bus_message *m) { int r; assert(bus); assert(m); - if (bus->is_kernel) - r = bus_kernel_read_message(bus, m); - else - r = bus_socket_read_message(bus, m); + r = bus_rqueue_make_room(bus, 1); + if (r < 0) + return r; - return r; + bus->rqueue[bus->rqueue_size++] = m; + + return 0; } static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) { - sd_bus_message *z = NULL; int r, ret = 0; assert(bus); assert(m); assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO); - if (bus->rqueue_size > 0) { - /* Dispatch a queued message */ + for (;;) { + if (bus->rqueue_size > 0) { + /* Dispatch a queued message */ - *m = bus->rqueue[0]; - bus->rqueue_size --; - memmove(bus->rqueue, bus->rqueue + 1, sizeof(sd_bus_message*) * bus->rqueue_size); - return 1; - } + *m = bus->rqueue[0]; + bus->rqueue_size --; + memmove(bus->rqueue, bus->rqueue + 1, sizeof(sd_bus_message*) * bus->rqueue_size); + return 1; + } - /* Try to read a new message */ - do { - r = bus_read_message(bus, &z); + /* Try to read a new message */ + r = bus_read_message(bus); if (r < 0) return r; if (r == 0) return ret; ret = 1; - } while (!z); - - *m = z; - return ret; + } } _public_ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { @@ -1604,10 +1606,10 @@ _public_ int sd_bus_call( sd_bus_error *error, sd_bus_message **reply) { - int r; usec_t timeout; uint64_t serial; - bool room = false; + unsigned i; + int r; assert_return(bus, -EINVAL); assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); @@ -1626,37 +1628,26 @@ _public_ int sd_bus_call( return r; timeout = calc_elapse(usec); + i = bus->rqueue_size; for (;;) { usec_t left; - sd_bus_message *incoming = NULL; - - if (!room) { - sd_bus_message **q; - if (bus->rqueue_size >= BUS_RQUEUE_MAX) - return -ENOBUFS; - - /* Make sure there's room for queuing this - * locally, before we read the message */ - - q = realloc(bus->rqueue, (bus->rqueue_size + 1) * sizeof(sd_bus_message*)); - if (!q) - return -ENOMEM; - - bus->rqueue = q; - room = true; - } - - r = bus_read_message(bus, &incoming); + r = bus_read_message(bus); if (r < 0) return r; - if (incoming) { + while (i < bus->rqueue_size) { + sd_bus_message *incoming = NULL; + + incoming = bus->rqueue[i]; if (incoming->reply_serial == serial) { /* Found a match! */ + memmove(bus->rqueue + i, bus->rqueue + i + 1, sizeof(sd_bus_message*) * (bus->rqueue_size - i - 1)); + bus->rqueue_size--; + if (incoming->header->type == SD_BUS_MESSAGE_METHOD_RETURN) { if (reply) @@ -1689,6 +1680,9 @@ _public_ int sd_bus_call( incoming->sender && streq(bus->unique_name, incoming->sender)) { + memmove(bus->rqueue + i, bus->rqueue + i + 1, sizeof(sd_bus_message*) * (bus->rqueue_size - i - 1)); + bus->rqueue_size--; + /* Our own message? Somebody is trying * to send its own client a message, * let's not dead-lock, let's fail @@ -1698,15 +1692,11 @@ _public_ int sd_bus_call( return -ELOOP; } - /* There's already guaranteed to be room for - * this, so need to resize things here */ - bus->rqueue[bus->rqueue_size ++] = incoming; - room = false; - /* Try to read more, right-away */ - continue; + i++; } - if (r != 0) + + if (r > 0) continue; if (timeout > 0) { @@ -1828,6 +1818,8 @@ static int process_timeout(sd_bus *bus) { if (r < 0) return r; + m->sender = "org.freedesktop.DBus"; + r = bus_seal_message(bus, m); if (r < 0) return r; @@ -2149,6 +2141,8 @@ static int process_closing(sd_bus *bus, sd_bus_message **ret) { if (r < 0) return r; + m->sender = "org.freedesktop.DBus.Local"; + r = bus_seal_message(bus, m); if (r < 0) return r;