X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fsd-bus.c;h=0b71f3ea5462a95e210abb2b1a6236aa23c903e5;hb=c784c5ce777f16ee56086a072dc1466639bc9eff;hp=a71d7b5d77961df4ab58a777e70e95f758c31c50;hpb=98178d3947d951ca001eaf400b5f362f458dceb5;p=elogind.git

diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c
index a71d7b5d7..0b71f3ea5 100644
--- a/src/libsystemd-bus/sd-bus.c
+++ b/src/libsystemd-bus/sd-bus.c
@@ -48,8 +48,7 @@ static void bus_free(sd_bus *b) {
 
         assert(b);
 
-        if (b->fd >= 0)
-                close_nointr_nofail(b->fd);
+        sd_bus_close(b);
 
         free(b->rbuffer);
         free(b->unique_name);
@@ -101,7 +100,7 @@ int sd_bus_new(sd_bus **ret) {
                 return -ENOMEM;
 
         r->n_ref = 1;
-        r->fd = -1;
+        r->input_fd = r->output_fd = -1;
         r->message_version = 1;
         r->negotiate_fds = true;
 
@@ -137,15 +136,18 @@ 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 (fd < 0)
+        if (input_fd < 0)
+                return -EINVAL;
+        if (output_fd < 0)
                 return -EINVAL;
 
-        bus->fd = fd;
+        bus->input_fd = input_fd;
+        bus->output_fd = output_fd;
         return 0;
 }
 
@@ -679,10 +681,7 @@ static int bus_start_address(sd_bus *b) {
         assert(b);
 
         for (;;) {
-                if (b->fd >= 0) {
-                        close_nointr_nofail(b->fd);
-                        b->fd = -1;
-                }
+                sd_bus_close(b);
 
                 if (b->sockaddr.sa.sa_family != AF_UNSPEC) {
 
@@ -720,15 +719,27 @@ static int bus_start_fd(sd_bus *b) {
         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;
 
+        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;
+        }
+
         return bus_socket_take_fd(b);
 }
 
@@ -745,7 +756,7 @@ int sd_bus_start(sd_bus *bus) {
         if (bus->is_server && bus->bus_client)
                 return -EINVAL;
 
-        if (bus->fd >= 0)
+        if (bus->input_fd >= 0)
                 r = bus_start_fd(bus);
         else if (bus->address || bus->sockaddr.sa.sa_family != AF_UNSPEC || bus->exec_path)
                 r = bus_start_address(bus);
@@ -848,11 +859,13 @@ fail:
 void sd_bus_close(sd_bus *bus) {
         if (!bus)
                 return;
-        if (bus->fd < 0)
-                return;
 
-        close_nointr_nofail(bus->fd);
-        bus->fd = -1;
+        if (bus->input_fd >= 0)
+                close_nointr_nofail(bus->input_fd);
+        if (bus->output_fd >= 0 && bus->output_fd != bus->input_fd)
+                close_nointr_nofail(bus->output_fd);
+
+        bus->input_fd = bus->output_fd = -1;
 }
 
 sd_bus *sd_bus_ref(sd_bus *bus) {
@@ -882,7 +895,7 @@ int sd_bus_is_open(sd_bus *bus) {
         if (!bus)
                 return -EINVAL;
 
-        return bus->state != BUS_UNSET && bus->fd >= 0;
+        return bus->state != BUS_UNSET && bus->input_fd >= 0;
 }
 
 int sd_bus_can_send(sd_bus *bus, char type) {
@@ -890,7 +903,7 @@ int sd_bus_can_send(sd_bus *bus, char type) {
 
         if (!bus)
                 return -EINVAL;
-        if (bus->fd < 0)
+        if (bus->output_fd < 0)
                 return -ENOTCONN;
 
         if (type == SD_BUS_TYPE_UNIX_FD) {
@@ -941,7 +954,7 @@ static int dispatch_wqueue(sd_bus *bus) {
         assert(bus);
         assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
 
-        if (bus->fd < 0)
+        if (bus->output_fd < 0)
                 return -ENOTCONN;
 
         while (bus->wqueue_size > 0) {
@@ -984,7 +997,7 @@ 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)
+        if (bus->input_fd < 0)
                 return -ENOTCONN;
 
         if (bus->rqueue_size > 0) {
@@ -1020,7 +1033,7 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) {
                 return -EINVAL;
         if (bus->state == BUS_UNSET)
                 return -ENOTCONN;
-        if (bus->fd < 0)
+        if (bus->output_fd < 0)
                 return -ENOTCONN;
         if (!m)
                 return -EINVAL;
@@ -1129,7 +1142,7 @@ int sd_bus_send_with_reply(
                 return -EINVAL;
         if (bus->state == BUS_UNSET)
                 return -ENOTCONN;
-        if (bus->fd < 0)
+        if (bus->output_fd < 0)
                 return -ENOTCONN;
         if (!m)
                 return -EINVAL;
@@ -1211,7 +1224,7 @@ int bus_ensure_running(sd_bus *bus) {
 
         assert(bus);
 
-        if (bus->fd < 0)
+        if (bus->input_fd < 0)
                 return -ENOTCONN;
         if (bus->state == BUS_UNSET)
                 return -ENOTCONN;
@@ -1248,7 +1261,7 @@ int sd_bus_send_with_reply_and_block(
 
         if (!bus)
                 return -EINVAL;
-        if (bus->fd < 0)
+        if (bus->output_fd < 0)
                 return -ENOTCONN;
         if (bus->state == BUS_UNSET)
                 return -ENOTCONN;
@@ -1358,11 +1371,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->input_fd < 0)
                 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) {
@@ -1372,7 +1386,7 @@ int sd_bus_get_events(sd_bus *bus) {
                 return -EINVAL;
         if (bus->state == BUS_UNSET)
                 return -ENOTCONN;
-        if (bus->fd < 0)
+        if (bus->input_fd < 0)
                 return -ENOTCONN;
 
         if (bus->state == BUS_OPENING)
@@ -1403,7 +1417,7 @@ int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) {
                 return -EINVAL;
         if (bus->state == BUS_UNSET)
                 return -ENOTCONN;
-        if (bus->fd < 0)
+        if (bus->input_fd < 0)
                 return -ENOTCONN;
 
         if (bus->state == BUS_AUTHENTICATING) {
@@ -1411,12 +1425,16 @@ 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;
@@ -1499,20 +1517,47 @@ static int process_filter(sd_bus *bus, sd_bus_message *m) {
         assert(bus);
         assert(m);
 
-        LIST_FOREACH(callbacks, l, bus->filter_callbacks) {
-                r = l->callback(bus, 0, m, l->userdata);
-                if (r != 0)
-                        return r;
-        }
+        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 = l->callback(bus, 0, 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);
 
-        return bus_match_run(bus, &bus->match_callbacks, 0, m);
+        do {
+                bus->match_callbacks_modified = false;
+
+                r = bus_match_run(bus, &bus->match_callbacks, 0, m);
+                if (r != 0)
+                        return r;
+
+        } while (bus->match_callbacks_modified);
+
+        return 0;
 }
 
 static int process_builtin(sd_bus *bus, sd_bus_message *m) {
@@ -1547,7 +1592,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",
@@ -1567,12 +1612,12 @@ static int process_builtin(sd_bus *bus, sd_bus_message *m) {
 }
 
 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_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
         struct object_callback *c;
-        char *p;
         int r;
         bool found = false;
+        size_t pl;
 
         assert(bus);
         assert(m);
@@ -1583,35 +1628,53 @@ static int process_object(sd_bus *bus, sd_bus_message *m) {
         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)
-                        return r;
+        pl = strlen(m->path);
 
-                found = true;
-        }
+        do {
+                char p[pl+1];
 
-        /* Look for fallback prefixes */
-        p = strdupa(m->path);
-        for (;;) {
-                char *e;
+                bus->object_callbacks_modified = false;
 
-                e = strrchr(p, '/');
-                if (e == p || !e)
-                        break;
+                c = hashmap_get(bus->object_callbacks, m->path);
+                if (c && c->last_iteration != bus->iteration_counter) {
 
-                *e = 0;
+                        c->last_iteration = bus->iteration_counter;
 
-                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;
 
                         found = true;
                 }
-        }
+
+                /* 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 = c->callback(bus, 0, 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
@@ -1732,6 +1795,8 @@ static int process_message(sd_bus *bus, sd_bus_message *m) {
         assert(bus);
         assert(m);
 
+        bus->iteration_counter++;
+
         r = process_hello(bus, m);
         if (r != 0)
                 return r;
@@ -1792,7 +1857,7 @@ static int process_running(sd_bus *bus, sd_bus_message **ret) {
 
         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;
+                _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
 
                 sd_bus_error_set(&error, "org.freedesktop.DBus.Error.UnknownObject", "Unknown object '%s'.", m->path);
 
@@ -1824,9 +1889,13 @@ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) {
 
         if (!bus)
                 return -EINVAL;
-        if (bus->fd < 0)
+        if (bus->input_fd < 0)
                 return -ENOTCONN;
 
+        /* We don't allow recursively invoking sd_bus_process(). */
+        if (bus->processing)
+                return -EBUSY;
+
         switch (bus->state) {
 
         case BUS_UNSET:
@@ -1852,21 +1921,25 @@ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) {
         case BUS_RUNNING:
         case BUS_HELLO:
 
-                return process_running(bus, ret);
+                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->input_fd < 0)
                 return -ENOTCONN;
 
         e = sd_bus_get_events(bus);
@@ -1882,19 +1955,28 @@ 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;
 
@@ -1907,7 +1989,7 @@ int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) {
                 return -EINVAL;
         if (bus->state == BUS_UNSET)
                 return -ENOTCONN;
-        if (bus->fd < 0)
+        if (bus->input_fd < 0)
                 return -ENOTCONN;
         if (bus->rqueue_size > 0)
                 return 0;
@@ -1922,7 +2004,7 @@ int sd_bus_flush(sd_bus *bus) {
                 return -EINVAL;
         if (bus->state == BUS_UNSET)
                 return -ENOTCONN;
-        if (bus->fd < 0)
+        if (bus->output_fd < 0)
                 return -ENOTCONN;
 
         r = bus_ensure_running(bus);
@@ -1960,6 +2042,7 @@ int sd_bus_add_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *user
         f->callback = callback;
         f->userdata = userdata;
 
+        bus->filter_callbacks_modified = true;
         LIST_PREPEND(struct filter_callback, callbacks, bus->filter_callbacks, f);
         return 0;
 }
@@ -1974,6 +2057,7 @@ int sd_bus_remove_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *u
 
         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;
@@ -2018,6 +2102,7 @@ static int bus_add_object(
         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);
@@ -2051,6 +2136,7 @@ static int bus_remove_object(
         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);
@@ -2090,6 +2176,7 @@ int sd_bus_add_match(sd_bus *bus, const char *match, sd_bus_message_handler_t ca
         }
 
         if (callback) {
+                bus->match_callbacks_modified = true;
                 r = bus_match_add(&bus->match_callbacks, match, callback, userdata, NULL);
                 if (r < 0) {
 
@@ -2112,10 +2199,69 @@ int sd_bus_remove_match(sd_bus *bus, const char *match, sd_bus_message_handler_t
         if (bus->bus_client)
                 r = bus_remove_match_internal(bus, match);
 
-        if (callback)
+        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);
+}