chiark / gitweb /
bus: add the ability for backends to queue to input messages at the same time
[elogind.git] / src / libsystemd-bus / sd-bus.c
index 73774ba308c67430160892ab17bf4f7931426a87..86265955bbde42508e48e6adf9acdb94846fc893 100644 (file)
 #include <netdb.h>
 #include <sys/poll.h>
 #include <byteswap.h>
+#include <sys/mman.h>
+#include <pthread.h>
 
 #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"
+#include "bus-introspect.h"
+#include "bus-signature.h"
+#include "bus-objects.h"
+#include "bus-util.h"
+#include "bus-container.h"
 
 static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec);
 
-static void bus_free(sd_bus *b) {
-        struct filter_callback *f;
-        unsigned i;
+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_node_destroy(sd_bus *b, struct node *n) {
+        struct node_callback *c;
+        struct node_vtable *v;
+        struct node_enumerator *e;
 
         assert(b);
 
-        if (b->fd >= 0)
-                close_nointr_nofail(b->fd);
+        if (!n)
+                return;
 
-        free(b->rbuffer);
-        free(b->unique_name);
-        free(b->auth_uid);
-        free(b->address);
+        while (n->child)
+                bus_node_destroy(b, n->child);
+
+        while ((c = n->callbacks)) {
+                LIST_REMOVE(callbacks, n->callbacks, c);
+                free(c);
+        }
+
+        while ((v = n->vtables)) {
+                LIST_REMOVE(vtables, n->vtables, v);
+                free(v->interface);
+                free(v);
+        }
+
+        while ((e = n->enumerators)) {
+                LIST_REMOVE(enumerators, n->enumerators, e);
+                free(e);
+        }
+
+        if (n->parent)
+                LIST_REMOVE(siblings, n->parent->child, n);
+
+        assert_se(hashmap_remove(b->nodes, n->path) == n);
+        free(n->path);
+        free(n);
+}
+
+static void bus_reset_queues(sd_bus *b) {
+        unsigned i;
+
+        assert(b);
 
         for (i = 0; i < b->rqueue_size; i++)
                 sd_bus_message_unref(b->rqueue[i]);
@@ -60,50 +112,221 @@ static void bus_free(sd_bus *b) {
                 sd_bus_message_unref(b->wqueue[i]);
         free(b->wqueue);
 
+        b->rqueue = b->wqueue = NULL;
+        b->rqueue_size = b->wqueue_size = 0;
+}
+
+static void bus_free(sd_bus *b) {
+        struct filter_callback *f;
+        struct node *n;
+
+        assert(b);
+
+        sd_bus_detach_event(b);
+
+        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_buffer);
+        free(b->address);
+        free(b->kernel);
+        free(b->machine);
+
+        free(b->exec_path);
+        strv_free(b->exec_argv);
+
+        close_many(b->fds, b->n_fds);
+        free(b->fds);
+
+        bus_reset_queues(b);
+
         hashmap_free_free(b->reply_callbacks);
         prioq_free(b->reply_callbacks_prioq);
 
         while ((f = b->filter_callbacks)) {
-                LIST_REMOVE(struct filter_callback, callbacks, b->filter_callbacks, f);
+                LIST_REMOVE(callbacks, b->filter_callbacks, f);
                 free(f);
         }
 
+        bus_match_free(&b->match_callbacks);
+
+        hashmap_free_free(b->vtable_methods);
+        hashmap_free_free(b->vtable_properties);
+
+        while ((n = hashmap_first(b->nodes)))
+                bus_node_destroy(b, n);
+
+        hashmap_free(b->nodes);
+
+        bus_kernel_flush_memfd(b);
+
+        assert_se(pthread_mutex_destroy(&b->memfd_cache_mutex) == 0);
+
         free(b);
 }
 
-static sd_bus* bus_new(void) {
+_public_ int sd_bus_new(sd_bus **ret) {
         sd_bus *r;
 
+        assert_return(ret, -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->hello_flags |= KDBUS_HELLO_ACCEPT_FD;
+        r->attach_flags |= KDBUS_ATTACH_NAMES;
+        r->original_pid = getpid();
+
+        assert_se(pthread_mutex_init(&r->memfd_cache_mutex, NULL) == 0);
 
         /* 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;
+}
+
+_public_ int sd_bus_set_address(sd_bus *bus, const char *address) {
+        char *a;
+
+        assert_return(bus, -EINVAL);
+        assert_return(bus->state == BUS_UNSET, -EPERM);
+        assert_return(address, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        a = strdup(address);
+        if (!a)
+                return -ENOMEM;
+
+        free(bus->address);
+        bus->address = a;
 
-static int hello_callback(sd_bus *bus, int error, sd_bus_message *reply, void *userdata) {
+        return 0;
+}
+
+_public_ int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) {
+        assert_return(bus, -EINVAL);
+        assert_return(bus->state == BUS_UNSET, -EPERM);
+        assert_return(input_fd >= 0, -EINVAL);
+        assert_return(output_fd >= 0, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        bus->input_fd = input_fd;
+        bus->output_fd = output_fd;
+        return 0;
+}
+
+_public_ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) {
+        char *p, **a;
+
+        assert_return(bus, -EINVAL);
+        assert_return(bus->state == BUS_UNSET, -EPERM);
+        assert_return(path, -EINVAL);
+        assert_return(!strv_isempty(argv), -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        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;
+}
+
+_public_ int sd_bus_set_bus_client(sd_bus *bus, int b) {
+        assert_return(bus, -EINVAL);
+        assert_return(bus->state == BUS_UNSET, -EPERM);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        bus->bus_client = !!b;
+        return 0;
+}
+
+_public_ int sd_bus_negotiate_fds(sd_bus *bus, int b) {
+        assert_return(bus, -EINVAL);
+        assert_return(bus->state == BUS_UNSET, -EPERM);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        SET_FLAG(bus->hello_flags, KDBUS_HELLO_ACCEPT_FD, b);
+        return 0;
+}
+
+_public_ int sd_bus_negotiate_attach_timestamp(sd_bus *bus, int b) {
+        assert_return(bus, -EINVAL);
+        assert_return(bus->state == BUS_UNSET, -EPERM);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        SET_FLAG(bus->attach_flags, KDBUS_ATTACH_TIMESTAMP, b);
+        return 0;
+}
+
+_public_ int sd_bus_negotiate_attach_creds(sd_bus *bus, uint64_t mask) {
+        assert_return(bus, -EINVAL);
+        assert_return(mask <= _SD_BUS_CREDS_MAX, -EINVAL);
+        assert_return(bus->state == BUS_UNSET, -EPERM);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        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) {
+        assert_return(bus, -EINVAL);
+        assert_return(b || sd_id128_equal(server_id, SD_ID128_NULL), -EINVAL);
+        assert_return(bus->state == BUS_UNSET, -EPERM);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        bus->is_server = !!b;
+        bus->server_id = server_id;
+        return 0;
+}
+
+_public_ int sd_bus_set_anonymous(sd_bus *bus, int b) {
+        assert_return(bus, -EINVAL);
+        assert_return(bus->state == BUS_UNSET, -EPERM);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        bus->anonymous_auth = !!b;
+        return 0;
+}
+
+static int hello_callback(sd_bus *bus, sd_bus_message *reply, void *userdata, sd_bus_error *error) {
         const char *s;
         int r;
 
         assert(bus);
-
-        if (error != 0)
-                return -error;
-
+        assert(bus->state == BUS_HELLO || bus->state == BUS_CLOSING);
         assert(reply);
 
+        r = sd_bus_message_get_errno(reply);
+        if (r < 0)
+                return r;
+        if (r > 0)
+                return -r;
+
         r = sd_bus_message_read(reply, "s", &s);
         if (r < 0)
                 return r;
@@ -115,7 +338,8 @@ static int hello_callback(sd_bus *bus, int error, sd_bus_message *reply, void *u
         if (!bus->unique_name)
                 return -ENOMEM;
 
-        bus->state = BUS_RUNNING;
+        if (bus->state == BUS_HELLO)
+                bus->state = BUS_RUNNING;
 
         return 1;
 }
@@ -126,6 +350,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",
@@ -136,18 +363,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_call_async(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;
         }
@@ -163,21 +385,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 == '%') {
@@ -223,7 +448,10 @@ static int parse_address_key(const char **p, const char *key, char **value) {
                 a++;
 
         *p = a;
+
+        free(*value);
         *value = r;
+
         return 1;
 }
 
@@ -237,598 +465,747 @@ 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 (b->auth_timeout == 0)
-                b->auth_timeout = now(CLOCK_MONOTONIC) + BUS_DEFAULT_TIMEOUT;
+        if (!path) {
+                r = -EINVAL;
+                goto fail;
+        }
+
+        /* 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 */
+        assert(b);
+        assert(p);
+        assert(*p);
+        assert(guid);
 
-        e = memmem(b->rbuffer, b->rbuffer_size, "\r\n", 2);
-        if (!e)
-                return 0;
+        while (**p != 0 && **p != ';') {
+                r = parse_address_key(p, "guid", guid);
+                if (r < 0)
+                        return r;
+                else if (r > 0)
+                        continue;
 
-        f = memmem(e + 2, b->rbuffer_size - (e - (char*) b->rbuffer) - 2, "\r\n", 2);
-        if (!f)
-                return 0;
+                r = parse_address_key(p, "path", &path);
+                if (r < 0)
+                        return r;
+                else if (r > 0)
+                        continue;
 
-        if (e - (char*) b->rbuffer != 3 + 32)
-                return -EPERM;
+                skip_address_key(p);
+        }
 
-        if (memcmp(b->rbuffer, "OK ", 3))
-                return -EPERM;
+        if (!path)
+                return -EINVAL;
 
-        for (i = 0; i < 32; i += 2) {
-                int x, y;
+        free(b->kernel);
+        b->kernel = path;
+        path = NULL;
 
-                x = unhexchar(((char*) b->rbuffer)[3 + i]);
-                y = unhexchar(((char*) b->rbuffer)[3 + i + 1]);
+        return 0;
+}
 
-                if (x < 0 || y < 0)
-                        return -EINVAL;
+static int parse_container_address(sd_bus *b, const char **p, char **guid) {
+        _cleanup_free_ char *machine = NULL;
+        int r;
+
+        assert(b);
+        assert(p);
+        assert(*p);
+        assert(guid);
 
-                peer.bytes[i/2] = ((uint8_t) x << 4 | (uint8_t) y);
+        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 (!sd_id128_equal(b->peer, SD_ID128_NULL) &&
-            !sd_id128_equal(b->peer, peer))
-                return -EPERM;
+        if (!machine)
+                return -EINVAL;
 
-        b->peer = peer;
+        free(b->machine);
+        b->machine = machine;
+        machine = NULL;
 
-        b->can_fds =
-                (f - e == sizeof("\r\nAGREE_UNIX_FD") - 1) &&
-                memcmp(e + 2, "AGREE_UNIX_FD", sizeof("AGREE_UNIX_FD") - 1) == 0;
+        b->sockaddr.un.sun_family = AF_UNIX;
+        strncpy(b->sockaddr.un.sun_path, "/var/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path));
+        b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + sizeof("/var/run/dbus/system_bus_socket") - 1;
 
-        b->rbuffer_size -= (f + 2 - (char*) b->rbuffer);
-        memmove(b->rbuffer, f + 2, b->rbuffer_size);
+        return 0;
+}
 
-        r = bus_start_running(b);
-        if (r < 0)
-                return r;
+static void bus_reset_parsed_address(sd_bus *b) {
+        assert(b);
 
-        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;
+        free(b->machine);
+        b->machine = 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;
+        if (!b->address)
+                return 0;
+        if (b->address[b->address_index] == 0)
+                return 0;
 
-        n = MAX(3 + 32 + 2 + sizeof("AGREE_UNIX_FD") - 1 + 2, b->rbuffer_size * 2);
+        bus_reset_parsed_address(b);
 
-        if (n > BUS_AUTH_SIZE_MAX)
-                n = BUS_AUTH_SIZE_MAX;
+        a = b->address + b->address_index;
 
-        if (b->rbuffer_size >= n)
-                return -ENOBUFS;
+        while (*a != 0) {
 
-        p = realloc(b->rbuffer, n);
-        if (!p)
-                return -ENOMEM;
+                if (*a == ';') {
+                        a++;
+                        continue;
+                }
 
-        b->rbuffer = p;
+                if (startswith(a, "unix:")) {
+                        a += 5;
 
-        zero(iov);
-        iov.iov_base = (uint8_t*) b->rbuffer + b->rbuffer_size;
-        iov.iov_len = n - b->rbuffer_size;
+                        r = parse_unix_address(b, &a, &guid);
+                        if (r < 0)
+                                return r;
+                        break;
 
-        zero(mh);
-        mh.msg_iov = &iov;
-        mh.msg_iovlen = 1;
+                } else if (startswith(a, "tcp:")) {
 
-        k = recvmsg(b->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL);
-        if (k < 0)
-                return errno == EAGAIN ? 0 : -errno;
+                        a += 4;
+                        r = parse_tcp_address(b, &a, &guid);
+                        if (r < 0)
+                                return r;
 
-        b->rbuffer_size += k;
+                        break;
 
-        r = bus_auth_verify(b);
-        if (r != 0)
-                return r;
+                } else if (startswith(a, "unixexec:")) {
+
+                        a += 9;
+                        r = parse_exec_address(b, &a, &guid);
+                        if (r < 0)
+                                return r;
+
+                        break;
+
+                } else if (startswith(a, "kernel:")) {
+
+                        a += 7;
+                        r = parse_kernel_address(b, &a, &guid);
+                        if (r < 0)
+                                return r;
 
+                        break;
+                } else if (startswith(a, "x-container:")) {
+
+                        a += 12;
+                        r = parse_container_address(b, &a, &guid);
+                        if (r < 0)
+                                return r;
+
+                        break;
+                }
+
+                a = strchr(a, ';');
+                if (!a)
+                        return 0;
+        }
+
+        if (guid) {
+                r = sd_id128_from_string(guid, &b->server_id);
+                if (r < 0)
+                        return r;
+        }
+
+        b->address_index = a - b->address;
         return 1;
 }
 
-static int bus_setup_fd(sd_bus *b) {
-        int one;
+static int bus_start_address(sd_bus *b) {
+        int r;
 
         assert(b);
 
-        /* Enable SO_PASSCRED + SO_PASSEC. We try this on any socket,
-         * just in case. This is actually irrelavant for */
-        one = 1;
-        setsockopt(b->fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one));
-        setsockopt(b->fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one));
+        for (;;) {
+                sd_bus_close(b);
+
+                if (b->exec_path) {
 
-        /* Increase the buffers to a MB */
-        fd_inc_rcvbuf(b->fd, 1024*1024);
-        fd_inc_sndbuf(b->fd, 1024*1024);
+                        r = bus_socket_exec(b);
+                        if (r >= 0)
+                                return r;
 
-        return 0;
-}
+                        b->last_connect_error = -r;
+                } else if (b->kernel) {
 
-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";
+                        r = bus_kernel_connect(b);
+                        if (r >= 0)
+                                return r;
 
-        char text[20 + 1]; /* enough space for a 64bit integer plus NUL */
-        size_t l;
+                        b->last_connect_error = -r;
 
-        assert(b);
+                } else if (b->machine) {
+
+                        r = bus_container_connect(b);
+                        if (r >= 0)
+                                return r;
 
-        b->state = BUS_AUTHENTICATING;
+                        b->last_connect_error = -r;
 
-        snprintf(text, sizeof(text), "%llu", (unsigned long long) geteuid());
-        char_array_0(text);
+                } else if (b->sockaddr.sa.sa_family != AF_UNSPEC) {
 
-        l = strlen(text);
-        b->auth_uid = hexmem(text, l);
-        if (!b->auth_uid)
-                return -ENOMEM;
+                        r = bus_socket_connect(b);
+                        if (r >= 0)
+                                return r;
+
+                        b->last_connect_error = -r;
+                }
+
+                r = bus_parse_next_address(b);
+                if (r < 0)
+                        return r;
+                if (r == 0)
+                        return b->last_connect_error ? -b->last_connect_error : -ECONNREFUSED;
+        }
+}
 
-        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;
+int bus_next_address(sd_bus *b) {
+        assert(b);
 
-        return bus_write_auth(b);
+        bus_reset_parsed_address(b);
+        return bus_start_address(b);
 }
 
-static int bus_start_connect(sd_bus *b) {
+static int bus_start_fd(sd_bus *b) {
+        struct stat st;
         int r;
 
         assert(b);
-        assert(b->fd < 0);
+        assert(b->input_fd >= 0);
+        assert(b->output_fd >= 0);
 
-        for (;;) {
-                if (b->sockaddr.sa.sa_family == AF_UNSPEC) {
-                        r = bus_parse_next_address(b);
-                        if (r < 0)
-                                return r;
-                        if (r == 0)
-                                return b->last_connect_error ? -b->last_connect_error : -ECONNREFUSED;
-                }
+        r = fd_nonblock(b->input_fd, true);
+        if (r < 0)
+                return r;
 
-                b->fd = socket(b->sockaddr.sa.sa_family, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
-                if (b->fd < 0) {
-                        b->last_connect_error = errno;
-                        goto try_again;
-                }
+        r = fd_cloexec(b->input_fd, true);
+        if (r < 0)
+                return r;
 
-                r = bus_setup_fd(b);
-                if (r < 0) {
-                        b->last_connect_error = errno;
-                        goto try_again;
-                }
+        if (b->input_fd != b->output_fd) {
+                r = fd_nonblock(b->output_fd, true);
+                if (r < 0)
+                        return r;
 
-                r = connect(b->fd, &b->sockaddr.sa, b->sockaddr_size);
-                if (r < 0) {
-                        if (errno == EINPROGRESS)
-                                return 1;
+                r = fd_cloexec(b->output_fd, true);
+                if (r < 0)
+                        return r;
+        }
 
-                        b->last_connect_error = errno;
-                        goto try_again;
-                }
+        if (fstat(b->input_fd, &st) < 0)
+                return -errno;
+
+        if (S_ISCHR(b->input_fd))
+                return bus_kernel_take_fd(b);
+        else
+                return bus_socket_take_fd(b);
+}
 
-                return bus_start_auth(b);
+_public_ int sd_bus_start(sd_bus *bus) {
+        int r;
 
-        try_again:
-                zero(b->sockaddr);
+        assert_return(bus, -EINVAL);
+        assert_return(bus->state == BUS_UNSET, -EPERM);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
 
-                if (b->fd >= 0) {
-                        close_nointr_nofail(b->fd);
-                        b->fd = -1;
-                }
-        }
+        bus->state = BUS_OPENING;
+
+        if (bus->is_server && bus->bus_client)
+                return -EINVAL;
+
+        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 || bus->machine)
+                r = bus_start_address(bus);
+        else
+                return -EINVAL;
+
+        if (r < 0)
+                return r;
+
+        return bus_send_hello(bus);
 }
 
-int sd_bus_open_system(sd_bus **ret) {
+_public_ int sd_bus_open_system(sd_bus **ret) {
         const char *e;
         sd_bus *b;
         int r;
 
-        if (!ret)
-                return -EINVAL;
+        assert_return(ret, -EINVAL);
+
+        r = sd_bus_new(&b);
+        if (r < 0)
+                return r;
 
-        e = getenv("DBUS_SYSTEM_BUS_ADDRESS");
+        e = secure_getenv("DBUS_SYSTEM_BUS_ADDRESS");
         if (e) {
-                r = sd_bus_open_address(e, &b);
+                r = sd_bus_set_address(b, e);
                 if (r < 0)
-                        return r;
+                        goto fail;
         } 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);
-                        return r;
-                }
         }
 
-        r = bus_send_hello(b);
-        if (r < 0) {
-                sd_bus_unref(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_user(sd_bus **ret) {
+_public_ int sd_bus_open_user(sd_bus **ret) {
         const char *e;
         sd_bus *b;
         size_t l;
         int r;
 
-        if (!ret)
-                return -EINVAL;
+        assert_return(ret, -EINVAL);
+
+        r = sd_bus_new(&b);
+        if (r < 0)
+                return r;
 
-        e = getenv("DBUS_SESSION_BUS_ADDRESS");
+        e = secure_getenv("DBUS_SESSION_BUS_ADDRESS");
         if (e) {
-                r = sd_bus_open_address(e, &b);
+                r = sd_bus_set_address(b, e);
                 if (r < 0)
-                        return r;
+                        goto fail;
         } else {
-                e = getenv("XDG_RUNTIME_DIR");
-                if (!e)
-                        return -ENOENT;
+                e = secure_getenv("XDG_RUNTIME_DIR");
+                if (!e) {
+                        r = -ENOENT;
+                        goto fail;
+                }
 
                 l = strlen(e);
-                if (l + 4 > sizeof(b->sockaddr.un.sun_path))
-                        return -E2BIG;
-
-                b = bus_new();
-                if (!b)
-                        return -ENOMEM;
+                if (l + 4 > sizeof(b->sockaddr.un.sun_path)) {
+                        r = -E2BIG;
+                        goto fail;
+                }
 
                 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;
-
-                r = bus_start_connect(b);
-                if (r < 0) {
-                        bus_free(b);
-                        return r;
-                }
         }
 
-        r = bus_send_hello(b);
-        if (r < 0) {
-                sd_bus_unref(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_address(const char *address, sd_bus **ret) {
-        sd_bus *b;
+_public_ int sd_bus_open_system_remote(const char *host, sd_bus **ret) {
+        _cleanup_free_ char *e = NULL;
+        char *p = NULL;
+        sd_bus *bus;
         int r;
 
-        if (!address)
-                return -EINVAL;
-        if (!ret)
-                return -EINVAL;
+        assert_return(host, -EINVAL);
+        assert_return(ret, -EINVAL);
 
-        b = bus_new();
-        if (!b)
+        e = bus_address_escape(host);
+        if (!e)
                 return -ENOMEM;
 
-        b->address = strdup(address);
-        if (!b->address) {
-                bus_free(b);
+        p = strjoin("unixexec:path=ssh,argv1=-xT,argv2=", e, ",argv3=systemd-stdio-bridge", NULL);
+        if (!p)
                 return -ENOMEM;
+
+        r = sd_bus_new(&bus);
+        if (r < 0) {
+                free(p);
+                return r;
         }
 
-        r = bus_start_connect(b);
+        bus->address = p;
+        bus->bus_client = true;
+
+        r = sd_bus_start(bus);
         if (r < 0) {
-                bus_free(b);
+                bus_free(bus);
                 return r;
         }
 
-        *ret = b;
+        *ret = bus;
         return 0;
 }
 
-int sd_bus_open_fd(int fd, sd_bus **ret) {
-        sd_bus *b;
+_public_ int sd_bus_open_system_container(const char *machine, sd_bus **ret) {
+        _cleanup_free_ char *e = NULL;
+        sd_bus *bus;
+        char *p;
         int r;
 
-        if (fd < 0)
-                return -EINVAL;
-        if (!ret)
-                return -EINVAL;
+        assert_return(machine, -EINVAL);
+        assert_return(ret, -EINVAL);
 
-        b = bus_new();
-        if (!b)
+        e = bus_address_escape(machine);
+        if (!e)
                 return -ENOMEM;
 
-        b->fd = fd;
-
-        r = fd_nonblock(b->fd, true);
-        if (r < 0)
-                goto fail;
+        p = strjoin("x-container:machine=", e, NULL);
+        if (!p)
+                return -ENOMEM;
 
-        fd_cloexec(b->fd, true);
-        if (r < 0)
-                goto fail;
+        r = sd_bus_new(&bus);
+        if (r < 0) {
+                free(p);
+                return r;
+        }
 
-        r = bus_setup_fd(b);
-        if (r < 0)
-                goto fail;
+        bus->address = p;
+        bus->bus_client = true;
 
-        r = bus_start_auth(b);
-        if (r < 0)
-                goto fail;
+        r = sd_bus_start(bus);
+        if (r < 0) {
+                bus_free(bus);
+                return r;
+        }
 
-        *ret = b;
+        *ret = bus;
         return 0;
-
-fail:
-                bus_free(b);
-        return r;
 }
 
-void sd_bus_close(sd_bus *bus) {
+_public_ void sd_bus_close(sd_bus *bus) {
+
         if (!bus)
                 return;
-        if (bus->fd < 0)
+        if (bus->state == BUS_CLOSED)
+                return;
+        if (bus_pid_changed(bus))
                 return;
 
-        close_nointr_nofail(bus->fd);
-        bus->fd = -1;
+        bus->state = BUS_CLOSED;
+
+        sd_bus_detach_event(bus);
+
+        /* Drop all queued messages so that they drop references to
+         * the bus object and the bus may be freed */
+        bus_reset_queues(bus);
+
+        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;
+static void bus_enter_closing(sd_bus *bus) {
+        assert(bus);
 
-        assert(bus->n_ref > 0);
+        if (bus->state != BUS_OPENING &&
+            bus->state != BUS_AUTHENTICATING &&
+            bus->state != BUS_HELLO &&
+            bus->state != BUS_RUNNING)
+                return;
 
-        bus->n_ref++;
-        return bus;
+        bus->state = BUS_CLOSING;
 }
 
-sd_bus *sd_bus_unref(sd_bus *bus) {
-        if (!bus)
-                return NULL;
+_public_ sd_bus *sd_bus_ref(sd_bus *bus) {
+        assert_return(bus, NULL);
+
+        assert_se(REFCNT_INC(bus->n_ref) >= 2);
+
+        return bus;
+}
 
-        assert(bus->n_ref > 0);
-        bus->n_ref--;
+_public_ sd_bus *sd_bus_unref(sd_bus *bus) {
+        assert_return(bus, NULL);
 
-        if (bus->n_ref <= 0)
+        if (REFCNT_DEC(bus->n_ref) <= 0)
                 bus_free(bus);
 
         return NULL;
 }
 
-int sd_bus_is_open(sd_bus *bus) {
-        if (!bus)
-                return -EINVAL;
+_public_ int sd_bus_is_open(sd_bus *bus) {
+
+        assert_return(bus, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
 
-        return bus->fd >= 0;
+        return BUS_IS_OPEN(bus->state);
 }
 
-int sd_bus_can_send(sd_bus *bus, char type) {
+_public_ int sd_bus_can_send(sd_bus *bus, char type) {
         int r;
 
-        if (!bus)
-                return -EINVAL;
+        assert_return(bus, -EINVAL);
+        assert_return(bus->state != BUS_UNSET, -ENOTCONN);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
 
         if (type == SD_BUS_TYPE_UNIX_FD) {
+                if (!(bus->hello_flags & KDBUS_HELLO_ACCEPT_FD))
+                        return 0;
+
                 r = bus_ensure_running(bus);
                 if (r < 0)
                         return r;
@@ -839,249 +1216,67 @@ 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) {
+_public_ int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) {
         int r;
 
-        if (!bus)
-                return -EINVAL;
-        if (!peer)
-                return -EINVAL;
+        assert_return(bus, -EINVAL);
+        assert_return(server_id, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
 
         r = bus_ensure_running(bus);
         if (r < 0)
                 return r;
 
-        *peer = bus->peer;
+        *server_id = bus->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)
                 return -EPERM;
 
-        if (m->sealed)
+        if (m->sealed) {
+                /* If we copy the same message to multiple
+                 * destinations, avoid using the same serial
+                 * numbers. */
+                b->serial = MAX(b->serial, BUS_MESSAGE_SERIAL(m));
                 return 0;
+        }
 
         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;
+static int bus_write_message(sd_bus *bus, sd_bus_message *message, size_t *idx) {
+        int r;
 
         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;
+        assert(message);
 
-        k = sendmsg(bus->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL);
-        if (k < 0)
-                return errno == EAGAIN ? 0 : -errno;
+        if (bus->is_kernel)
+                r = bus_kernel_write_message(bus, message);
+        else
+                r = bus_socket_write_message(bus, message, idx);
 
-        *idx += (size_t) k;
-        return 1;
+        return r;
 }
 
-static int message_read_need(sd_bus *bus, size_t *need) {
-        uint32_t a, b;
-        uint8_t e;
-        uint64_t sum;
+static int dispatch_wqueue(sd_bus *bus) {
+        int r, ret = 0;
 
         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,
-                                    bus->ucred_valid ? &bus->ucred : NULL,
-                                    bus->label[0] ? bus->label : NULL, &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;
-        union {
-                struct cmsghdr cmsghdr;
-                uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) +
-                            CMSG_SPACE(NAME_MAX)]; /*selinux label */
-        } control;
-        struct cmsghdr *cmsg;
-
-        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;
-        mh.msg_control = &control;
-        mh.msg_controllen = sizeof(control);
-
-        k = recvmsg(bus->fd, &mh, MSG_DONTWAIT|MSG_NOSIGNAL|MSG_CMSG_CLOEXEC);
-        if (k < 0)
-                return errno == EAGAIN ? 0 : -errno;
-
-        bus->rbuffer_size += k;
-        bus->ucred_valid = false;
-        bus->label[0] = 0;
-
-        for (cmsg = CMSG_FIRSTHDR(&mh); cmsg; cmsg = CMSG_NXTHDR(&mh, cmsg)) {
-                if (cmsg->cmsg_level == SOL_SOCKET &&
-                    cmsg->cmsg_type == SCM_CREDENTIALS &&
-                    cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred))) {
-
-                        memcpy(&bus->ucred, CMSG_DATA(cmsg), sizeof(struct ucred));
-                        bus->ucred_valid = true;
-
-                } else if (cmsg->cmsg_level == SOL_SOCKET &&
-                         cmsg->cmsg_type == SCM_SECURITY) {
-
-                        size_t l;
-                        l = cmsg->cmsg_len - CMSG_LEN(0);
-                        memcpy(&bus->label, CMSG_DATA(cmsg), l);
-                        bus->label[l] = 0;
-                }
-        }
-
-        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 (r < 0) {
-                        sd_bus_close(bus);
+                r = bus_write_message(bus, bus->wqueue[0], &bus->windex);
+                if (r < 0)
                         return r;
-                else if (r == 0)
+                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.
                          *
@@ -1104,52 +1299,95 @@ static int dispatch_wqueue(sd_bus *bus) {
         return ret;
 }
 
+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);
+
+        r = bus_rqueue_make_room(bus, 1);
+        if (r < 0)
+                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->fd < 0)
-                return -ENOTCONN;
-
-        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 = message_read(bus, &z);
-                if (r < 0) {
-                        sd_bus_close(bus);
+                /* Try to read a new message */
+                r = bus_read_message(bus);
+                if (r < 0)
                         return r;
-                }
                 if (r == 0)
                         return ret;
 
-                r = 1;
-        } while (!z);
-
-        *m = z;
-        return 1;
+                ret = 1;
+        }
 }
 
-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) {
         int r;
 
-        if (!bus)
-                return -EINVAL;
-        if (bus->fd < 0)
-                return -ENOTCONN;
-        if (!m)
-                return -EINVAL;
+        assert_return(bus, -EINVAL);
+        assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+        assert_return(m, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        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 */
@@ -1163,16 +1401,15 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) {
         /* If this is a reply and no reply was requested, then let's
          * suppress this, if we can */
         if (m->dont_send && !serial)
-                return 0;
+                return 1;
 
         if ((bus->state == BUS_RUNNING || bus->state == BUS_HELLO) && bus->wqueue_size <= 0) {
                 size_t idx = 0;
 
-                r = message_write(bus, m, &idx);
-                if (r < 0) {
-                        sd_bus_close(bus);
+                r = bus_write_message(bus, m, &idx);
+                if (r < 0)
                         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
@@ -1201,7 +1438,28 @@ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) {
         if (serial)
                 *serial = BUS_MESSAGE_SERIAL(m);
 
-        return 0;
+        return 1;
+}
+
+_public_ int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *serial) {
+        int r;
+
+        assert_return(bus, -EINVAL);
+        assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+        assert_return(m, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        if (!streq_ptr(m->destination, destination)) {
+
+                if (!destination)
+                        return -EEXIST;
+
+                r = sd_bus_message_set_destination(m, destination);
+                if (r < 0)
+                        return r;
+        }
+
+        return sd_bus_send(bus, m, serial);
 }
 
 static usec_t calc_elapse(uint64_t usec) {
@@ -1232,10 +1490,10 @@ static int timeout_compare(const void *a, const void *b) {
         return 0;
 }
 
-int sd_bus_send_with_reply(
+_public_ int sd_bus_call_async(
                 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) {
@@ -1243,18 +1501,13 @@ int sd_bus_send_with_reply(
         struct reply_callback *c;
         int r;
 
-        if (!bus)
-                return -EINVAL;
-        if (bus->fd < 0)
-                return -ENOTCONN;
-        if (!m)
-                return -EINVAL;
-        if (!callback)
-                return -EINVAL;
-        if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
-                return -EINVAL;
-        if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
-                return -EINVAL;
+        assert_return(bus, -EINVAL);
+        assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+        assert_return(m, -EINVAL);
+        assert_return(m->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EINVAL);
+        assert_return(!(m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED), -EINVAL);
+        assert_return(callback, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
 
         r = hashmap_ensure_allocated(&bus->reply_callbacks, uint64_hash_func, uint64_compare_func);
         if (r < 0)
@@ -1270,7 +1523,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;
 
@@ -1289,27 +1542,26 @@ int sd_bus_send_with_reply(
                 r = prioq_put(bus->reply_callbacks_prioq, c, &c->prioq_idx);
                 if (r < 0) {
                         c->timeout = 0;
-                        sd_bus_send_with_reply_cancel(bus, c->serial);
+                        sd_bus_call_async_cancel(bus, c->serial);
                         return r;
                 }
         }
 
         r = sd_bus_send(bus, m, serial);
         if (r < 0) {
-                sd_bus_send_with_reply_cancel(bus, c->serial);
+                sd_bus_call_async_cancel(bus, c->serial);
                 return r;
         }
 
         return r;
 }
 
-int sd_bus_send_with_reply_cancel(sd_bus *bus, uint64_t serial) {
+_public_ int sd_bus_call_async_cancel(sd_bus *bus, uint64_t serial) {
         struct reply_callback *c;
 
-        if (!bus)
-                return -EINVAL;
-        if (serial == 0)
-                return -EINVAL;
+        assert_return(bus, -EINVAL);
+        assert_return(serial != 0, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
 
         c = hashmap_remove(bus->reply_callbacks, &serial);
         if (!c)
@@ -1327,6 +1579,8 @@ int bus_ensure_running(sd_bus *bus) {
 
         assert(bus);
 
+        if (bus->state == BUS_UNSET || bus->state == BUS_CLOSED || bus->state == BUS_CLOSING)
+                return -ENOTCONN;
         if (bus->state == BUS_RUNNING)
                 return 1;
 
@@ -1345,30 +1599,25 @@ int bus_ensure_running(sd_bus *bus) {
         }
 }
 
-int sd_bus_send_with_reply_and_block(
+_public_ int sd_bus_call(
                 sd_bus *bus,
                 sd_bus_message *m,
                 uint64_t usec,
                 sd_bus_error *error,
                 sd_bus_message **reply) {
 
-        int r;
         usec_t timeout;
         uint64_t serial;
-        bool room = false;
+        unsigned i;
+        int r;
 
-        if (!bus)
-                return -EINVAL;
-        if (bus->fd < 0)
-                return -ENOTCONN;
-        if (!m)
-                return -EINVAL;
-        if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
-                return -EINVAL;
-        if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
-                return -EINVAL;
-        if (bus_error_is_dirty(error))
-                return -EINVAL;
+        assert_return(bus, -EINVAL);
+        assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+        assert_return(m, -EINVAL);
+        assert_return(m->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EINVAL);
+        assert_return(!(m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED), -EINVAL);
+        assert_return(!bus_error_is_dirty(error), -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
 
         r = bus_ensure_running(bus);
         if (r < 0)
@@ -1379,42 +1628,37 @@ int sd_bus_send_with_reply_and_block(
                 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;
+                r = bus_read_message(bus);
+                if (r < 0)
+                        return r;
 
-                        if (bus->rqueue_size >= BUS_RQUEUE_MAX)
-                                return -ENOBUFS;
+                while (i < bus->rqueue_size) {
+                        sd_bus_message *incoming = NULL;
 
-                        /* Make sure there's room for queuing this
-                         * locally, before we read the message */
+                        incoming = bus->rqueue[i];
 
-                        q = realloc(bus->rqueue, (bus->rqueue_size + 1) * sizeof(sd_bus_message*));
-                        if (!q)
-                                return -ENOMEM;
+                        if (incoming->reply_serial == serial) {
+                                /* Found a match! */
 
-                        bus->rqueue = q;
-                        room = true;
-                }
+                                memmove(bus->rqueue + i, bus->rqueue + i + 1, sizeof(sd_bus_message*) * (bus->rqueue_size - i - 1));
+                                bus->rqueue_size--;
 
-                r = message_read(bus, &incoming);
-                if (r < 0)
-                        return r;
-                if (incoming) {
+                                if (incoming->header->type == SD_BUS_MESSAGE_METHOD_RETURN) {
 
-                        if (incoming->reply_serial == serial) {
-                                /* Found a match! */
+                                        if (reply)
+                                                *reply = incoming;
+                                        else
+                                                sd_bus_message_unref(incoming);
 
-                                if (incoming->header->type == SD_BUS_MESSAGE_TYPE_METHOD_RETURN) {
-                                        *reply = incoming;
-                                        return 0;
+                                        return 1;
                                 }
 
-                                if (incoming->header->type == SD_BUS_MESSAGE_TYPE_METHOD_ERROR) {
+                                if (incoming->header->type == SD_BUS_MESSAGE_METHOD_ERROR) {
                                         int k;
 
                                         r = sd_bus_error_copy(error, &incoming->error);
@@ -1423,24 +1667,36 @@ int sd_bus_send_with_reply_and_block(
                                                 return r;
                                         }
 
-                                        k = bus_error_to_errno(&incoming->error);
+                                        k = sd_bus_error_get_errno(&incoming->error);
                                         sd_bus_message_unref(incoming);
-                                        return k;
+                                        return -k;
                                 }
 
                                 sd_bus_message_unref(incoming);
                                 return -EIO;
-                        }
 
-                        /* There's already guaranteed to be room for
-                         * this, so need to resize things here */
-                        bus->rqueue[bus->rqueue_size ++] = incoming;
-                        room = false;
+                        } else if (incoming->header->serial == serial &&
+                                   bus->unique_name &&
+                                   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
+                                 * immediately. */
+
+                                sd_bus_message_unref(incoming);
+                                return -ELOOP;
+                        }
 
                         /* Try to read more, right-away */
-                        continue;
+                        i++;
                 }
-                if (r != 0)
+
+                if (r > 0)
                         continue;
 
                 if (timeout > 0) {
@@ -1464,29 +1720,27 @@ int sd_bus_send_with_reply_and_block(
         }
 }
 
-int sd_bus_get_fd(sd_bus *bus) {
-        if (!bus)
-                return -EINVAL;
+_public_ int sd_bus_get_fd(sd_bus *bus) {
 
-        if (bus->fd < 0)
-                return -ENOTCONN;
+        assert_return(bus, -EINVAL);
+        assert_return(bus->input_fd == bus->output_fd, -EPERM);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
 
-        return bus->fd;
+        return bus->input_fd;
 }
 
-int sd_bus_get_events(sd_bus *bus) {
+_public_ int sd_bus_get_events(sd_bus *bus) {
         int flags = 0;
 
-        if (!bus)
-                return -EINVAL;
-        if (bus->fd < 0)
-                return -ENOTCONN;
+        assert_return(bus, -EINVAL);
+        assert_return(BUS_IS_OPEN(bus->state) || bus->state == BUS_CLOSING, -ENOTCONN);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
 
         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;
@@ -1501,34 +1755,47 @@ int sd_bus_get_events(sd_bus *bus) {
         return flags;
 }
 
-int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) {
+_public_ int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) {
         struct reply_callback *c;
 
-        if (!bus)
-                return -EINVAL;
-        if (!timeout_usec)
-                return -EINVAL;
-        if (bus->fd < 0)
-                return -ENOTCONN;
+        assert_return(bus, -EINVAL);
+        assert_return(timeout_usec, -EINVAL);
+        assert_return(BUS_IS_OPEN(bus->state) || bus->state == BUS_CLOSING, -ENOTCONN);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        if (bus->state == BUS_CLOSING) {
+                *timeout_usec = 0;
+                return 1;
+        }
 
         if (bus->state == BUS_AUTHENTICATING) {
                 *timeout_usec = bus->auth_timeout;
                 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;
+        }
+
+        if (bus->rqueue_size > 0) {
+                *timeout_usec = 0;
+                return 1;
+        }
 
         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_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL;
+        _cleanup_bus_message_unref_ sd_bus_message* m = NULL;
         struct reply_callback *c;
         usec_t n;
         int r;
@@ -1543,209 +1810,279 @@ 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_CONST(SD_BUS_ERROR_NO_REPLY, "Method call timed out"),
+                        &m);
+        if (r < 0)
+                return r;
+
+        m->sender = "org.freedesktop.DBus";
+
+        r = bus_seal_message(bus, 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);
+        bus->current = m;
+        bus->iteration_counter ++;
+
+        r = c->callback(bus, m, c->userdata, &error_buffer);
+        r = bus_maybe_reply_error(m, r, &error_buffer);
         free(c);
 
-        return r < 0 ? r : 1;
-}
+        bus->current = NULL;
 
-static int process_builtin(sd_bus *bus, sd_bus_message *m) {
-        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
-        int r;
+        return r;
+}
 
+static int process_hello(sd_bus *bus, sd_bus_message *m) {
         assert(bus);
         assert(m);
 
-        if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
+        if (bus->state != BUS_HELLO)
                 return 0;
 
-        if (!streq_ptr(m->interface, "org.freedesktop.DBus.Peer"))
-                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->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
-                return 1;
+        if (m->header->type != SD_BUS_MESSAGE_METHOD_RETURN &&
+            m->header->type != SD_BUS_MESSAGE_METHOD_ERROR)
+                return -EIO;
 
-        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];
+        if (m->reply_serial != bus->hello_serial)
+                return -EIO;
 
-                r = sd_id128_get_machine(&id);
-                if (r < 0)
-                        return r;
+        return 0;
+}
 
-                r = sd_bus_message_new_method_return(bus, m, &reply);
-                if (r < 0)
-                        return r;
+static int process_reply(sd_bus *bus, sd_bus_message *m) {
+        _cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL;
+        struct reply_callback *c;
+        int 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;
+        assert(bus);
+        assert(m);
 
-                sd_bus_error_set(&error,
-                                 "org.freedesktop.DBus.Error.UnknownMethod",
-                                 "Unknown method '%s' on interface '%s'.", m->member, m->interface);
+        if (m->header->type != SD_BUS_MESSAGE_METHOD_RETURN &&
+            m->header->type != SD_BUS_MESSAGE_METHOD_ERROR)
+                return 0;
 
-                r = sd_bus_message_new_method_error(bus, m, &error, &reply);
-        }
+        c = hashmap_remove(bus->reply_callbacks, &m->reply_serial);
+        if (!c)
+                return 0;
 
-        if (r < 0)
-                return r;
+        if (c->timeout != 0)
+                prioq_remove(bus->reply_callbacks_prioq, c, &c->prioq_idx);
 
-        r = sd_bus_send(bus, reply, NULL);
+        r = sd_bus_message_rewind(m, true);
         if (r < 0)
                 return r;
 
-        return 1;
+        r = c->callback(bus, m, c->userdata, &error_buffer);
+        r = bus_maybe_reply_error(m, r, &error_buffer);
+        free(c);
+
+        return r;
 }
 
-static int process_message(sd_bus *bus, sd_bus_message *m) {
+static int process_filter(sd_bus *bus, sd_bus_message *m) {
+        _cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL;
         struct filter_callback *l;
         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) {
-                struct reply_callback *c;
+        do {
+                bus->filter_callbacks_modified = false;
+
+                LIST_FOREACH(callbacks, l, bus->filter_callbacks) {
 
-                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);
+                        if (bus->filter_callbacks_modified)
+                                break;
+
+                        /* Don't run this more than once per iteration */
+                        if (l->last_iteration == bus->iteration_counter)
+                                continue;
 
-                        r = c->callback(bus, 0, m, c->userdata);
-                        free(c);
+                        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, &error_buffer);
+                        r = bus_maybe_reply_error(m, r, &error_buffer);
                         if (r != 0)
                                 return r;
+
                 }
-        }
 
-        LIST_FOREACH(callbacks, l, bus->filter_callbacks) {
-                r = l->callback(bus, 0, m, l->userdata);
+        } 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;
-        }
 
-        return process_builtin(bus, m);
+        } while (bus->match_callbacks_modified);
+
+        return 0;
 }
 
-int sd_bus_process(sd_bus *bus, sd_bus_message **ret) {
+static int process_builtin(sd_bus *bus, sd_bus_message *m) {
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
         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. */
+        assert(bus);
+        assert(m);
 
-        if (!bus)
-                return -EINVAL;
-        if (bus->fd < 0)
-                return -ENOTCONN;
+        if (m->header->type != SD_BUS_MESSAGE_METHOD_CALL)
+                return 0;
 
-        if (bus->state == BUS_OPENING) {
-                struct pollfd p;
+        if (!streq_ptr(m->interface, "org.freedesktop.DBus.Peer"))
+                return 0;
+
+        if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+                return 1;
 
-                zero(p);
-                p.fd = bus->fd;
-                p.events = POLLOUT;
+        if (streq_ptr(m->member, "Ping"))
+                r = sd_bus_message_new_method_return(m, &reply);
+        else if (streq_ptr(m->member, "GetMachineId")) {
+                sd_id128_t id;
+                char sid[33];
 
-                r = poll(&p, 1, 0);
+                r = sd_id128_get_machine(&id);
                 if (r < 0)
-                        return -errno;
+                        return r;
 
-                if (p.revents & (POLLOUT|POLLERR|POLLHUP)) {
-                        int error = 0;
-                        socklen_t slen = sizeof(error);
+                r = sd_bus_message_new_method_return(m, &reply);
+                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 = sd_bus_message_append(reply, "s", sd_id128_to_string(id, sid));
+        } else {
+                r = sd_bus_message_new_method_errorf(
+                                m, &reply,
+                                SD_BUS_ERROR_UNKNOWN_METHOD,
+                                 "Unknown method '%s' on interface '%s'.", m->member, m->interface);
+        }
 
-                        /* Try next address */
-                        r = bus_start_connect(bus);
-                        goto null_message;
-                }
+        if (r < 0)
+                return r;
 
-                r = 0;
-                goto null_message;
+        r = sd_bus_send(bus, reply, NULL);
+        if (r < 0)
+                return r;
 
-        } else if (bus->state == BUS_AUTHENTICATING) {
+        return 1;
+}
 
-                if (now(CLOCK_MONOTONIC) >= bus->auth_timeout)
-                        return -ETIMEDOUT;
+static int process_message(sd_bus *bus, sd_bus_message *m) {
+        int r;
 
-                r = bus_write_auth(bus);
-                if (r != 0)
-                        goto null_message;
+        assert(bus);
+        assert(m);
 
-                r = bus_read_auth(bus);
-                goto null_message;
+        bus->current = m;
+        bus->iteration_counter++;
 
-        } else if (bus->state == BUS_RUNNING || bus->state == BUS_HELLO) {
-                _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
-                int k;
+        log_debug("Got message 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 = process_timeout(bus);
-                if (r != 0)
-                        goto null_message;
+        r = process_hello(bus, m);
+        if (r != 0)
+                goto finish;
 
-                r = dispatch_wqueue(bus);
-                if (r != 0)
-                        goto null_message;
+        r = process_reply(bus, m);
+        if (r != 0)
+                goto finish;
 
-                k = r;
-                r = dispatch_rqueue(bus, &m);
-                if (r < 0)
-                        return r;
-                if (!m) {
-                        if (r == 0)
-                                r = k;
-                        goto null_message;
-                }
+        r = process_filter(bus, m);
+        if (r != 0)
+                goto finish;
 
-                r = process_message(bus, m);
-                if (r != 0)
-                        goto null_message;
+        r = process_match(bus, m);
+        if (r != 0)
+                goto finish;
 
-                if (ret) {
-                        *ret = m;
-                        m = NULL;
-                        return 1;
-                }
+        r = process_builtin(bus, m);
+        if (r != 0)
+                goto finish;
 
-                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;
+        r = bus_process_object(bus, m);
 
-                        sd_bus_error_set(&error, "org.freedesktop.DBus.Error.UnknownObject", "Unknown object '%s'.", m->path);
+finish:
+        bus->current = NULL;
+        return r;
+}
 
-                        r = sd_bus_message_new_method_error(bus, m, &error, &reply);
-                        if (r < 0)
-                                return r;
+static int process_running(sd_bus *bus, sd_bus_message **ret) {
+        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        int r;
 
-                        r = sd_bus_send(bus, reply, NULL);
-                        if (r < 0)
-                                return r;
-                }
+        assert(bus);
+        assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
+
+        r = process_timeout(bus);
+        if (r != 0)
+                goto null_message;
+
+        r = dispatch_wqueue(bus);
+        if (r != 0)
+                goto null_message;
+
+        r = dispatch_rqueue(bus, &m);
+        if (r < 0)
+                return r;
+        if (!m)
+                goto null_message;
 
+        r = process_message(bus, m);
+        if (r != 0)
+                goto null_message;
+
+        if (ret) {
+                r = sd_bus_message_rewind(m, true);
+                if (r < 0)
+                        return r;
+
+                *ret = m;
+                m = NULL;
                 return 1;
         }
 
-        assert_not_reached("Unknown state");
+        if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL) {
+
+                r = sd_bus_reply_method_errorf(
+                                m,
+                                SD_BUS_ERROR_UNKNOWN_OBJECT,
+                                "Unknown object '%s'.", m->path);
+                if (r < 0)
+                        return r;
+        }
+
+        return 1;
 
 null_message:
         if (r >= 0 && ret)
@@ -1754,68 +2091,236 @@ null_message:
         return r;
 }
 
+static int process_closing(sd_bus *bus, sd_bus_message **ret) {
+        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        struct reply_callback *c;
+        int r;
+
+        assert(bus);
+        assert(bus->state == BUS_CLOSING);
+
+        c = hashmap_first(bus->reply_callbacks);
+        if (c) {
+                _cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL;
+
+                /* First, fail all outstanding method calls */
+                r = bus_message_new_synthetic_error(
+                                bus,
+                                c->serial,
+                                &SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_NO_REPLY, "Connection terminated"),
+                                &m);
+                if (r < 0)
+                        return r;
+
+                r = bus_seal_message(bus, m);
+                if (r < 0)
+                        return r;
+
+                if (c->timeout != 0)
+                        prioq_remove(bus->reply_callbacks_prioq, c, &c->prioq_idx);
+
+                hashmap_remove(bus->reply_callbacks, &c->serial);
+
+                bus->current = m;
+                bus->iteration_counter++;
+
+                r = c->callback(bus, m, c->userdata, &error_buffer);
+                r = bus_maybe_reply_error(m, r, &error_buffer);
+                free(c);
+
+                goto finish;
+        }
+
+        /* Then, synthesize a Disconnected message */
+        r = sd_bus_message_new_signal(
+                        bus,
+                        "/org/freedesktop/DBus/Local",
+                        "org.freedesktop.DBus.Local",
+                        "Disconnected",
+                        &m);
+        if (r < 0)
+                return r;
+
+        m->sender = "org.freedesktop.DBus.Local";
+
+        r = bus_seal_message(bus, m);
+        if (r < 0)
+                return r;
+
+        sd_bus_close(bus);
+
+        bus->current = m;
+        bus->iteration_counter++;
+
+        r = process_filter(bus, m);
+        if (r != 0)
+                goto finish;
+
+        r = process_match(bus, m);
+        if (r != 0)
+                goto finish;
+
+        if (ret) {
+                *ret = m;
+                m = NULL;
+        }
+
+        r = 1;
+
+finish:
+        bus->current = NULL;
+        return r;
+}
+
+_public_ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) {
+        BUS_DONT_DESTROY(bus);
+        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. */
+
+        assert_return(bus, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        /* We don't allow recursively invoking sd_bus_process(). */
+        assert_return(!bus->current, -EBUSY);
+
+        switch (bus->state) {
+
+        case BUS_UNSET:
+        case BUS_CLOSED:
+                return -ENOTCONN;
+
+        case BUS_OPENING:
+                r = bus_socket_process_opening(bus);
+                if (r == -ECONNRESET || r == -EPIPE) {
+                        bus_enter_closing(bus);
+                        r = 1;
+                } else if (r < 0)
+                        return r;
+                if (ret)
+                        *ret = NULL;
+                return r;
+
+        case BUS_AUTHENTICATING:
+                r = bus_socket_process_authenticating(bus);
+                if (r == -ECONNRESET || r == -EPIPE) {
+                        bus_enter_closing(bus);
+                        r = 1;
+                } else if (r < 0)
+                        return r;
+
+                if (ret)
+                        *ret = NULL;
+
+                return r;
+
+        case BUS_RUNNING:
+        case BUS_HELLO:
+                r = process_running(bus, ret);
+                if (r == -ECONNRESET || r == -EPIPE) {
+                        bus_enter_closing(bus);
+                        r = 1;
+
+                        if (ret)
+                                *ret = NULL;
+                }
+
+                return r;
+
+        case BUS_CLOSING:
+                return process_closing(bus, ret);
+        }
+
+        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;
+        usec_t m = (usec_t) -1;
 
         assert(bus);
 
-        if (bus->fd < 0)
-                return -ENOTCONN;
+        if (bus->state == BUS_CLOSING)
+                return 1;
+
+        assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
 
         e = sd_bus_get_events(bus);
         if (e < 0)
                 return e;
 
         if (need_more)
+                /* The caller really needs some more data, he doesn't
+                 * care about what's already read, or any timeouts
+                 * except its own.*/
                 e |= POLLIN;
-
-        r = sd_bus_get_timeout(bus, &until);
-        if (r < 0)
-                return r;
-        if (r == 0)
-                m = (uint64_t) -1;
         else {
-                usec_t n;
-                n = now(CLOCK_MONOTONIC);
-                m = until > n ? until - n : 0;
+                usec_t until;
+                /* The caller wants to process if there's something to
+                 * process, but doesn't care otherwise */
+
+                r = sd_bus_get_timeout(bus, &until);
+                if (r < 0)
+                        return r;
+                if (r > 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;
 
         return r > 0 ? 1 : 0;
 }
 
-int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) {
+_public_ int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) {
+
+        assert_return(bus, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        if (bus->state == BUS_CLOSING)
+                return 0;
+
+        assert_return(BUS_IS_OPEN(bus->state) , -ENOTCONN);
 
-        if (!bus)
-                return -EINVAL;
-        if (bus->fd < 0)
-                return -ENOTCONN;
         if (bus->rqueue_size > 0)
                 return 0;
 
         return bus_poll(bus, false, timeout_usec);
 }
 
-int sd_bus_flush(sd_bus *bus) {
+_public_ int sd_bus_flush(sd_bus *bus) {
         int r;
 
-        if (!bus)
-                return -EINVAL;
-        if (bus->fd < 0)
-                return -ENOTCONN;
+        assert_return(bus, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        if (bus->state == BUS_CLOSING)
+                return 0;
+
+        assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
 
         r = bus_ensure_running(bus);
         if (r < 0)
@@ -1838,35 +2343,41 @@ int sd_bus_flush(sd_bus *bus) {
         }
 }
 
-int sd_bus_add_filter(sd_bus *bus, sd_message_handler_t callback, void *userdata) {
+_public_ int sd_bus_add_filter(sd_bus *bus,
+                               sd_bus_message_handler_t callback,
+                               void *userdata) {
+
         struct filter_callback *f;
 
-        if (!bus)
-                return -EINVAL;
-        if (!callback)
-                return -EINVAL;
+        assert_return(bus, -EINVAL);
+        assert_return(callback, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
 
-        f = new(struct filter_callback, 1);
+        f = new0(struct filter_callback, 1);
         if (!f)
                 return -ENOMEM;
         f->callback = callback;
         f->userdata = userdata;
 
-        LIST_PREPEND(struct filter_callback, callbacks, bus->filter_callbacks, f);
+        bus->filter_callbacks_modified = true;
+        LIST_PREPEND(callbacks, bus->filter_callbacks, f);
         return 0;
 }
 
-int sd_bus_remove_filter(sd_bus *bus, sd_message_handler_t callback, void *userdata) {
+_public_ int sd_bus_remove_filter(sd_bus *bus,
+                                  sd_bus_message_handler_t callback,
+                                  void *userdata) {
+
         struct filter_callback *f;
 
-        if (!bus)
-                return -EINVAL;
-        if (!callback)
-                return -EINVAL;
+        assert_return(bus, -EINVAL);
+        assert_return(callback, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
 
         LIST_FOREACH(callbacks, f, bus->filter_callbacks) {
                 if (f->callback == callback && f->userdata == userdata) {
-                        LIST_REMOVE(struct filter_callback, callbacks, bus->filter_callbacks, f);
+                        bus->filter_callbacks_modified = true;
+                        LIST_REMOVE(callbacks, bus->filter_callbacks, f);
                         free(f);
                         return 1;
                 }
@@ -1874,3 +2385,433 @@ int sd_bus_remove_filter(sd_bus *bus, sd_message_handler_t callback, void *userd
 
         return 0;
 }
+
+_public_ int sd_bus_add_match(sd_bus *bus,
+                              const char *match,
+                              sd_bus_message_handler_t callback,
+                              void *userdata) {
+
+        struct bus_match_component *components = NULL;
+        unsigned n_components = 0;
+        uint64_t cookie = 0;
+        int r = 0;
+
+        assert_return(bus, -EINVAL);
+        assert_return(match, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        r = bus_match_parse(match, &components, &n_components);
+        if (r < 0)
+                goto finish;
+
+        if (bus->bus_client) {
+                cookie = ++bus->match_cookie;
+
+                r = bus_add_match_internal(bus, match, components, n_components, cookie);
+                if (r < 0)
+                        goto finish;
+        }
+
+        bus->match_callbacks_modified = true;
+        r = bus_match_add(&bus->match_callbacks, components, n_components, callback, userdata, cookie, NULL);
+        if (r < 0) {
+                if (bus->bus_client)
+                        bus_remove_match_internal(bus, match, cookie);
+        }
+
+finish:
+        bus_match_parse_free(components, n_components);
+        return r;
+}
+
+_public_ int sd_bus_remove_match(sd_bus *bus,
+                                 const char *match,
+                                 sd_bus_message_handler_t callback,
+                                 void *userdata) {
+
+        struct bus_match_component *components = NULL;
+        unsigned n_components = 0;
+        int r = 0, q = 0;
+        uint64_t cookie = 0;
+
+        assert_return(bus, -EINVAL);
+        assert_return(match, -EINVAL);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        r = bus_match_parse(match, &components, &n_components);
+        if (r < 0)
+                return r;
+
+        bus->match_callbacks_modified = true;
+        r = bus_match_remove(&bus->match_callbacks, components, n_components, callback, userdata, &cookie);
+
+        if (bus->bus_client)
+                q = bus_remove_match_internal(bus, match, cookie);
+
+        bus_match_parse_free(components, n_components);
+
+        return r < 0 ? r : q;
+}
+
+bool bus_pid_changed(sd_bus *bus) {
+        assert(bus);
+
+        /* We don't support people creating a bus connection and
+         * keeping it around over a fork(). Let's complain. */
+
+        return bus->original_pid != getpid();
+}
+
+static int io_callback(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+        sd_bus *bus = userdata;
+        int r;
+
+        assert(bus);
+
+        r = sd_bus_process(bus, NULL);
+        if (r < 0)
+                return r;
+
+        return 1;
+}
+
+static int time_callback(sd_event_source *s, uint64_t usec, void *userdata) {
+        sd_bus *bus = userdata;
+        int r;
+
+        assert(bus);
+
+        r = sd_bus_process(bus, NULL);
+        if (r < 0)
+                return r;
+
+        return 1;
+}
+
+static int prepare_callback(sd_event_source *s, void *userdata) {
+        sd_bus *bus = userdata;
+        int r, e;
+        usec_t until;
+
+        assert(s);
+        assert(bus);
+
+        e = sd_bus_get_events(bus);
+        if (e < 0)
+                return e;
+
+        if (bus->output_fd != bus->input_fd) {
+
+                r = sd_event_source_set_io_events(bus->input_io_event_source, e & POLLIN);
+                if (r < 0)
+                        return r;
+
+                r = sd_event_source_set_io_events(bus->output_io_event_source, e & POLLOUT);
+                if (r < 0)
+                        return r;
+        } else {
+                r = sd_event_source_set_io_events(bus->input_io_event_source, e);
+                if (r < 0)
+                        return r;
+        }
+
+        r = sd_bus_get_timeout(bus, &until);
+        if (r < 0)
+                return r;
+        if (r > 0) {
+                int j;
+
+                j = sd_event_source_set_time(bus->time_event_source, until);
+                if (j < 0)
+                        return j;
+        }
+
+        r = sd_event_source_set_enabled(bus->time_event_source, r > 0);
+        if (r < 0)
+                return r;
+
+        return 1;
+}
+
+static int quit_callback(sd_event_source *event, void *userdata) {
+        sd_bus *bus = userdata;
+
+        assert(event);
+
+        sd_bus_flush(bus);
+
+        return 1;
+}
+
+_public_ int sd_bus_attach_event(sd_bus *bus, sd_event *event, int priority) {
+        int r;
+
+        assert_return(bus, -EINVAL);
+        assert_return(!bus->event, -EBUSY);
+
+        assert(!bus->input_io_event_source);
+        assert(!bus->output_io_event_source);
+        assert(!bus->time_event_source);
+
+        if (event)
+                bus->event = sd_event_ref(event);
+        else  {
+                r = sd_event_default(&bus->event);
+                if (r < 0)
+                        return r;
+        }
+
+        r = sd_event_add_io(bus->event, bus->input_fd, 0, io_callback, bus, &bus->input_io_event_source);
+        if (r < 0)
+                goto fail;
+
+        r = sd_event_source_set_priority(bus->input_io_event_source, priority);
+        if (r < 0)
+                goto fail;
+
+        if (bus->output_fd != bus->input_fd) {
+                r = sd_event_add_io(bus->event, bus->output_fd, 0, io_callback, bus, &bus->output_io_event_source);
+                if (r < 0)
+                        goto fail;
+
+                r = sd_event_source_set_priority(bus->output_io_event_source, priority);
+                if (r < 0)
+                        goto fail;
+        }
+
+        r = sd_event_source_set_prepare(bus->input_io_event_source, prepare_callback);
+        if (r < 0)
+                goto fail;
+
+        r = sd_event_add_monotonic(bus->event, 0, 0, time_callback, bus, &bus->time_event_source);
+        if (r < 0)
+                goto fail;
+
+        r = sd_event_source_set_priority(bus->time_event_source, priority);
+        if (r < 0)
+                goto fail;
+
+        r = sd_event_add_quit(bus->event, quit_callback, bus, &bus->quit_event_source);
+        if (r < 0)
+                goto fail;
+
+        return 0;
+
+fail:
+        sd_bus_detach_event(bus);
+        return r;
+}
+
+_public_ int sd_bus_detach_event(sd_bus *bus) {
+        assert_return(bus, -EINVAL);
+        assert_return(bus->event, -ENXIO);
+
+        if (bus->input_io_event_source) {
+                sd_event_source_set_enabled(bus->input_io_event_source, SD_EVENT_OFF);
+                bus->input_io_event_source = sd_event_source_unref(bus->input_io_event_source);
+        }
+
+        if (bus->output_io_event_source) {
+                sd_event_source_set_enabled(bus->output_io_event_source, SD_EVENT_OFF);
+                bus->output_io_event_source = sd_event_source_unref(bus->output_io_event_source);
+        }
+
+        if (bus->time_event_source) {
+                sd_event_source_set_enabled(bus->time_event_source, SD_EVENT_OFF);
+                bus->time_event_source = sd_event_source_unref(bus->time_event_source);
+        }
+
+        if (bus->quit_event_source) {
+                sd_event_source_set_enabled(bus->quit_event_source, SD_EVENT_OFF);
+                bus->quit_event_source = sd_event_source_unref(bus->quit_event_source);
+        }
+
+        if (bus->event)
+                bus->event = sd_event_unref(bus->event);
+
+        return 0;
+}
+
+_public_ sd_event* sd_bus_get_event(sd_bus *bus) {
+        assert_return(bus, NULL);
+
+        return bus->event;
+}
+
+_public_ sd_bus_message* sd_bus_get_current(sd_bus *bus) {
+        assert_return(bus, NULL);
+
+        return bus->current;
+}
+
+static int bus_default(int (*bus_open)(sd_bus **), sd_bus **default_bus, sd_bus **ret) {
+        sd_bus *b = NULL;
+        int r;
+
+        assert(bus_open);
+        assert(default_bus);
+
+        if (!ret)
+                return !!*default_bus;
+
+        if (*default_bus) {
+                *ret = sd_bus_ref(*default_bus);
+                return 0;
+        }
+
+        r = bus_open(&b);
+        if (r < 0)
+                return r;
+
+        b->default_bus_ptr = default_bus;
+        b->tid = gettid();
+        *default_bus = b;
+
+        *ret = b;
+        return 1;
+}
+
+_public_ int sd_bus_default_system(sd_bus **ret) {
+        static __thread 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;
+
+        return bus_default(sd_bus_open_user, &default_user_bus, ret);
+}
+
+_public_ int sd_bus_get_tid(sd_bus *b, pid_t *tid) {
+        assert_return(b, -EINVAL);
+        assert_return(tid, -EINVAL);
+        assert_return(!bus_pid_changed(b), -ECHILD);
+
+        if (b->tid != 0) {
+                *tid = b->tid;
+                return 0;
+        }
+
+        if (b->event)
+                return sd_event_get_tid(b->event, tid);
+
+        return -ENXIO;
+}
+
+_public_ char *sd_bus_label_escape(const char *s) {
+        char *r, *t;
+        const char *f;
+
+        assert_return(s, NULL);
+
+        /* Escapes all chars that D-Bus' object path cannot deal
+         * with. Can be reversed with bus_path_unescape(). We special
+         * case the empty string. */
+
+        if (*s == 0)
+                return strdup("_");
+
+        r = new(char, strlen(s)*3 + 1);
+        if (!r)
+                return NULL;
+
+        for (f = s, t = r; *f; f++) {
+
+                /* Escape everything that is not a-zA-Z0-9. We also
+                 * escape 0-9 if it's the first character */
+
+                if (!(*f >= 'A' && *f <= 'Z') &&
+                    !(*f >= 'a' && *f <= 'z') &&
+                    !(f > s && *f >= '0' && *f <= '9')) {
+                        *(t++) = '_';
+                        *(t++) = hexchar(*f >> 4);
+                        *(t++) = hexchar(*f);
+                } else
+                        *(t++) = *f;
+        }
+
+        *t = 0;
+
+        return r;
+}
+
+_public_ char *sd_bus_label_unescape(const char *f) {
+        char *r, *t;
+
+        assert_return(f, NULL);
+
+        /* Special case for the empty string */
+        if (streq(f, "_"))
+                return strdup("");
+
+        r = new(char, strlen(f) + 1);
+        if (!r)
+                return NULL;
+
+        for (t = r; *f; f++) {
+
+                if (*f == '_') {
+                        int a, b;
+
+                        if ((a = unhexchar(f[1])) < 0 ||
+                            (b = unhexchar(f[2])) < 0) {
+                                /* Invalid escape code, let's take it literal then */
+                                *(t++) = '_';
+                        } else {
+                                *(t++) = (char) ((a << 4) | b);
+                                f += 2;
+                        }
+                } else
+                        *(t++) = *f;
+        }
+
+        *t = 0;
+
+        return r;
+}
+
+_public_ int sd_bus_get_peer_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **ret) {
+        sd_bus_creds *c;
+        pid_t pid = 0;
+        int r;
+
+        assert_return(bus, -EINVAL);
+        assert_return(mask <= _SD_BUS_CREDS_MAX, -ENOTSUP);
+        assert_return(ret, -EINVAL);
+        assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+        assert_return(!bus->is_kernel, -ENOTSUP);
+
+        if (!bus->ucred_valid && !isempty(bus->label))
+                return -ENODATA;
+
+        c = bus_creds_new();
+        if (!c)
+                return -ENOMEM;
+
+        if (bus->ucred_valid) {
+                pid = c->pid = bus->ucred.pid;
+                c->uid = bus->ucred.uid;
+                c->gid = bus->ucred.gid;
+
+                c->mask |= ((SD_BUS_CREDS_UID | SD_BUS_CREDS_PID | SD_BUS_CREDS_GID) & mask) & bus->creds_mask;
+        }
+
+        if (!isempty(bus->label) && (mask & SD_BUS_CREDS_SELINUX_CONTEXT)) {
+                c->label = strdup(bus->label);
+                if (!c->label) {
+                        sd_bus_creds_unref(c);
+                        return -ENOMEM;
+                }
+
+                c->mask |= SD_BUS_CREDS_SELINUX_CONTEXT | bus->creds_mask;
+        }
+
+        r = bus_creds_add_more(c, mask, pid, 0);
+        if (r < 0)
+                return r;
+
+        *ret = c;
+        return 0;
+}