chiark / gitweb /
libsystemd-bus: add lightweight object vtable implementation for exposing objects...
[elogind.git] / src / libsystemd-bus / sd-bus.c
index db0880f..b1dcd8d 100644 (file)
@@ -42,6 +42,8 @@
 #include "bus-socket.h"
 #include "bus-kernel.h"
 #include "bus-control.h"
+#include "bus-introspect.h"
+#include "bus-signature.h"
 
 static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec);
 
@@ -57,9 +59,46 @@ static void bus_close_fds(sd_bus *b) {
         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 (!n)
+                return;
+
+        while (n->child)
+                bus_node_destroy(b, n->child);
+
+        while ((c = n->callbacks)) {
+                LIST_REMOVE(struct node_callback, callbacks, n->callbacks, c);
+                free(c);
+        }
+
+        while ((v = n->vtables)) {
+                LIST_REMOVE(struct node_vtable, vtables, n->vtables, v);
+                free(v->interface);
+                free(v);
+        }
+
+        while ((e = n->enumerators)) {
+                LIST_REMOVE(struct node_enumerator, enumerators, n->enumerators, e);
+                free(e);
+        }
+
+        if (n->parent)
+                LIST_REMOVE(struct node, siblings, n->parent->child, n);
+
+        assert_se(hashmap_remove(b->nodes, n->path) == n);
+        free(n->path);
+        free(n);
+}
+
 static void bus_free(sd_bus *b) {
         struct filter_callback *f;
-        struct object_callback *c;
+        struct node *n;
         unsigned i;
 
         assert(b);
@@ -97,14 +136,16 @@ static void bus_free(sd_bus *b) {
                 free(f);
         }
 
-        while ((c = hashmap_steal_first(b->object_callbacks))) {
-                free(c->path);
-                free(c);
-        }
-
-        hashmap_free(b->object_callbacks);
         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);
@@ -1818,13 +1859,10 @@ static int process_builtin(sd_bus *bus, sd_bus_message *m) {
 
                 r = sd_bus_message_append(reply, "s", sd_id128_to_string(id, sid));
         } else {
-                _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
-
-                sd_bus_error_set(&error,
-                                 "org.freedesktop.DBus.Error.UnknownMethod",
+                r = sd_bus_message_new_method_errorf(
+                                bus, m, &reply,
+                                "org.freedesktop.DBus.Error.UnknownMethod",
                                  "Unknown method '%s' on interface '%s'.", m->member, m->interface);
-
-                r = sd_bus_message_new_method_error(bus, m, &error, &reply);
         }
 
         if (r < 0)
@@ -1837,779 +1875,2398 @@ static int process_builtin(sd_bus *bus, sd_bus_message *m) {
         return 1;
 }
 
-static int process_object(sd_bus *bus, sd_bus_message *m) {
-        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
-        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
-        struct object_callback *c;
+static int node_vtable_get_userdata(
+                sd_bus *bus,
+                const char *path,
+                struct node_vtable *c,
+                void **userdata) {
+
+        void *u;
         int r;
-        bool found = false;
-        size_t pl;
 
         assert(bus);
-        assert(m);
+        assert(path);
+        assert(c);
+        assert(userdata);
+
+        u = c->userdata;
+        if (c->find) {
+                r = c->find(bus, path, c->interface, &u, u);
+                if (r <= 0)
+                        return r;
+        }
 
-        if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
-                return 0;
+        *userdata = u;
+        return 1;
+}
 
-        if (hashmap_isempty(bus->object_callbacks))
-                return 0;
+static void *vtable_property_convert_userdata(const sd_bus_vtable *p, void *u) {
+        assert(p);
 
-        pl = strlen(m->path);
+        return (uint8_t*) u + p->property.offset;
+}
 
-        do {
-                char p[pl+1];
+static int vtable_property_get_userdata(
+                sd_bus *bus,
+                const char *path,
+                struct vtable_member *p,
+                void **userdata) {
 
-                bus->object_callbacks_modified = false;
+        void *u;
+        int r;
 
-                c = hashmap_get(bus->object_callbacks, m->path);
-                if (c && c->last_iteration != bus->iteration_counter) {
+        assert(bus);
+        assert(path);
+        assert(p);
+        assert(userdata);
 
-                        c->last_iteration = bus->iteration_counter;
+        r = node_vtable_get_userdata(bus, path, p->parent, &u);
+        if (r <= 0)
+                return r;
 
-                        r = sd_bus_message_rewind(m, true);
-                        if (r < 0)
-                                return r;
+        *userdata = vtable_property_convert_userdata(p->vtable, u);
+        return 1;
+}
 
-                        r = c->callback(bus, m, c->userdata);
-                        if (r != 0)
-                                return r;
+static int add_enumerated_to_set(sd_bus *bus, const char *prefix, struct node_enumerator *first, Set *s) {
+        struct node_enumerator *c;
+        int r;
 
-                        found = true;
-                }
+        assert(bus);
+        assert(prefix);
+        assert(s);
 
-                /* Look for fallback prefixes */
-                strcpy(p, m->path);
-                for (;;) {
-                        char *e;
+        LIST_FOREACH(enumerators, c, first) {
+                char **children = NULL, **k;
 
-                        if (bus->object_callbacks_modified)
-                                break;
+                r = c->callback(bus, prefix, &children, c->userdata);
+                if (r < 0)
+                        return r;
 
-                        e = strrchr(p, '/');
-                        if (e == p || !e)
-                                break;
+                STRV_FOREACH(k, children) {
+                        if (r < 0) {
+                                free(*k);
+                                continue;
+                        }
 
-                        *e = 0;
+                        if (!object_path_is_valid(*k) && object_path_startswith(*k, prefix)) {
+                                free(*k);
+                                r = -EINVAL;
+                                continue;
+                        }
 
-                        c = hashmap_get(bus->object_callbacks, p);
-                        if (c && c->last_iteration != bus->iteration_counter && c->is_fallback) {
+                        r = set_consume(s, *k);
+                }
 
-                                c->last_iteration = bus->iteration_counter;
+                free(children);
+                if (r < 0)
+                        return r;
+        }
 
-                                r = sd_bus_message_rewind(m, true);
-                                if (r < 0)
-                                        return r;
+        return 0;
+}
 
-                                r = c->callback(bus, m, c->userdata);
-                                if (r != 0)
-                                        return r;
+static int add_subtree_to_set(sd_bus *bus, const char *prefix, struct node *n, Set *s) {
+        struct node *i;
+        int r;
 
-                                found = true;
-                        }
-                }
+        assert(bus);
+        assert(prefix);
+        assert(n);
+        assert(s);
 
-        } while (bus->object_callbacks_modified);
+        r = add_enumerated_to_set(bus, prefix, n->enumerators, s);
+        if (r < 0)
+                return r;
 
-        /* We found some handlers but none wanted to take this, then
-         * return this -- with one exception, we can handle
-         * introspection minimally ourselves */
-        if (!found || sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect"))
-                return 0;
+        LIST_FOREACH(siblings, i, n->child) {
+                char *t;
 
-        sd_bus_error_set(&error,
-                         "org.freedesktop.DBus.Error.UnknownMethod",
-                         "Unknown method '%s' or interface '%s'.", m->member, m->interface);
+                t = strdup(i->path);
+                if (!t)
+                        return -ENOMEM;
 
-        r = sd_bus_message_new_method_error(bus, m, &error, &reply);
-        if (r < 0)
-                return r;
+                r = set_consume(s, t);
+                if (r < 0 && r != -EEXIST)
+                        return r;
 
-        r = sd_bus_send(bus, reply, NULL);
-        if (r < 0)
-                return r;
+                r = add_subtree_to_set(bus, prefix, i, s);
+                if (r < 0)
+                        return r;
+        }
 
-        return 1;
+        return 0;
 }
 
-static int process_introspect(sd_bus *bus, sd_bus_message *m) {
-        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
-        _cleanup_free_ char *introspection = NULL;
-        _cleanup_set_free_free_ Set *s = NULL;
-        _cleanup_fclose_ FILE *f = NULL;
-        struct object_callback *c;
-        Iterator i;
-        size_t size = 0;
-        char *node;
+static int get_child_nodes(sd_bus *bus, const char *prefix, struct node *n, Set **_s) {
+        Set *s = NULL;
         int r;
 
         assert(bus);
-        assert(m);
-
-        if (!sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect"))
-                return 0;
-
-        if (!m->path)
-                return 0;
+        assert(n);
+        assert(_s);
 
         s = set_new(string_hash_func, string_compare_func);
         if (!s)
                 return -ENOMEM;
 
-        HASHMAP_FOREACH(c, bus->object_callbacks, i) {
-                const char *e;
-                char *a, *p;
-
-                if (streq(c->path, "/"))
-                        continue;
-
-                if (streq(m->path, "/"))
-                        e = c->path;
-                else {
-                        e = startswith(c->path, m->path);
-                        if (!e || *e != '/')
-                                continue;
-                }
-
-                a = strdup(e+1);
-                if (!a)
-                        return -ENOMEM;
-
-                p = strchr(a, '/');
-                if (p)
-                        *p = 0;
-
-                r = set_consume(s, a);
-                if (r < 0 && r != -EEXIST)
-                        return r;
+        r = add_subtree_to_set(bus, prefix, n, s);
+        if (r < 0) {
+                set_free_free(s);
+                return r;
         }
 
-        f = open_memstream(&introspection, &size);
-        if (!f)
-                return -ENOMEM;
+        *_s = s;
+        return 0;
+}
 
-        fputs(SD_BUS_INTROSPECT_DOCTYPE, f);
-        fputs("<node>\n", f);
-        fputs(SD_BUS_INTROSPECT_INTERFACE_PEER, f);
-        fputs(SD_BUS_INTROSPECT_INTERFACE_INTROSPECTABLE, f);
+static int node_callbacks_run(
+                sd_bus *bus,
+                sd_bus_message *m,
+                struct node_callback *first,
+                bool require_fallback,
+                bool *found_object) {
 
-        while ((node = set_steal_first(s))) {
-                fprintf(f, " <node name=\"%s\"/>\n", node);
-                free(node);
-        }
+        struct node_callback *c;
+        int r;
 
-        fputs("</node>\n", f);
+        assert(bus);
+        assert(m);
+        assert(found_object);
 
-        fflush(f);
+        LIST_FOREACH(callbacks, c, first) {
+                if (require_fallback && !c->is_fallback)
+                        continue;
 
-        if (ferror(f))
-                return -ENOMEM;
+                *found_object = true;
 
-        r = sd_bus_message_new_method_return(bus, m, &reply);
-        if (r < 0)
-                return r;
+                if (c->last_iteration == bus->iteration_counter)
+                        continue;
 
-        r = sd_bus_message_append(reply, "s", introspection);
-        if (r < 0)
-                return r;
+                r = sd_bus_message_rewind(m, true);
+                if (r < 0)
+                        return r;
 
-        r = sd_bus_send(bus, reply, NULL);
-        if (r < 0)
-                return r;
+                r = c->callback(bus, m, c->userdata);
+                if (r != 0)
+                        return r;
+        }
 
-        return 1;
+        return 0;
 }
 
-static int process_message(sd_bus *bus, sd_bus_message *m) {
+static int method_callbacks_run(
+                sd_bus *bus,
+                sd_bus_message *m,
+                struct vtable_member *c,
+                bool require_fallback,
+                bool *found_object) {
+
+        const char *signature;
+        void *u;
         int r;
 
         assert(bus);
         assert(m);
+        assert(c);
+        assert(found_object);
 
-        bus->iteration_counter++;
+        if (require_fallback && !c->parent->is_fallback)
+                return 0;
 
-        r = process_hello(bus, m);
-        if (r != 0)
+        r = node_vtable_get_userdata(bus, m->path, c->parent, &u);
+        if (r <= 0)
                 return r;
 
-        r = process_reply(bus, m);
-        if (r != 0)
-                return r;
+        *found_object = true;
 
-        r = process_filter(bus, m);
-        if (r != 0)
+        r = sd_bus_message_rewind(m, true);
+        if (r < 0)
                 return r;
 
-        r = process_match(bus, m);
-        if (r != 0)
+        r = sd_bus_message_get_signature(m, true, &signature);
+        if (r < 0)
                 return r;
 
-        r = process_builtin(bus, m);
-        if (r != 0)
-                return r;
+        if (!streq(c->vtable->method.signature, signature)) {
+                r = sd_bus_reply_method_errorf(bus, m,
+                                               "org.freedesktop.DBus.Error.InvalidArgs",
+                                               "Invalid arguments '%s' to call %s:%s, expecting '%s'.",
+                                               signature, c->interface, c->member, c->vtable->method.signature);
+                if (r < 0)
+                        return r;
 
-        r = process_object(bus, m);
-        if (r != 0)
-                return r;
+                return 1;
+        }
 
-        return process_introspect(bus, m);
+        return c->vtable->method.handler(bus, m, u);
 }
 
-static int process_running(sd_bus *bus, sd_bus_message **ret) {
-        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+static int property_get_set_callbacks_run(
+                sd_bus *bus,
+                sd_bus_message *m,
+                struct vtable_member *c,
+                bool require_fallback,
+                bool is_get,
+                bool *found_object) {
+
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        void *u;
         int r;
 
         assert(bus);
-        assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
+        assert(m);
+        assert(found_object);
 
-        r = process_timeout(bus);
-        if (r != 0)
-                goto null_message;
+        if (require_fallback && !c->parent->is_fallback)
+                return 0;
 
-        r = dispatch_wqueue(bus);
-        if (r != 0)
-                goto null_message;
+        r = vtable_property_get_userdata(bus, m->path, c, &u);
+        if (r <= 0)
+                return r;
 
-        r = dispatch_rqueue(bus, &m);
+        *found_object = true;
+
+        r = sd_bus_message_new_method_return(bus, m, &reply);
         if (r < 0)
                 return r;
-        if (!m)
-                goto null_message;
 
-        r = process_message(bus, m);
-        if (r != 0)
-                goto null_message;
+        c->last_iteration = bus->iteration_counter;
 
-        if (ret) {
-                r = sd_bus_message_rewind(m, true);
+        if (is_get) {
+                r = sd_bus_message_open_container(reply, 'v', c->vtable->property.signature);
                 if (r < 0)
                         return r;
 
-                *ret = m;
-                m = NULL;
-                return 1;
-        }
+                if (c->vtable->property.get) {
+                        r = c->vtable->property.get(bus, m->path, c->interface, c->member, reply, &error, u);
+                        if (r < 0)
+                                return r;
+                } else
+                        assert_not_reached("automatic properties not supported yet");
 
-        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_NULL;
+                if (sd_bus_error_is_set(&error)) {
+                        r = sd_bus_reply_method_error(bus, m, &error);
+                        if (r < 0)
+                                return r;
 
-                sd_bus_error_set(&error, "org.freedesktop.DBus.Error.UnknownObject", "Unknown object '%s'.", m->path);
+                        return 1;
+                }
 
-                r = sd_bus_message_new_method_error(bus, m, &error, &reply);
+                r = sd_bus_message_close_container(reply);
                 if (r < 0)
                         return r;
 
-                r = sd_bus_send(bus, reply, NULL);
+        } else {
+                if (c->vtable->type != _SD_BUS_VTABLE_WRITABLE_PROPERTY)
+                        sd_bus_error_setf(&error, "org.freedesktop.DBus.Error.PropertyReadOnly", "Property '%s' is not writable.", c->member);
+                else  {
+                        r = sd_bus_message_enter_container(m, 'v', c->vtable->property.signature);
+                        if (r < 0)
+                                return r;
+
+                        if (c->vtable->property.set) {
+                                r = c->vtable->property.set(bus, m->path, c->interface, c->member, m, &error, u);
+                                if (r < 0)
+                                        return r;
+                        } else
+                                assert_not_reached("automatic properties not supported yet");
+                }
+
+                if (sd_bus_error_is_set(&error)) {
+                        r = sd_bus_reply_method_error(bus, m, &error);
+                        if (r < 0)
+                                return r;
+
+                        return 1;
+                }
+
+                r = sd_bus_message_exit_container(m);
                 if (r < 0)
                         return r;
         }
 
-        return 1;
-
-null_message:
-        if (r >= 0 && ret)
-                *ret = NULL;
+        r = sd_bus_send(bus, reply, NULL);
+        if (r < 0)
+                return r;
 
-        return r;
+        return 1;
 }
 
-int sd_bus_process(sd_bus *bus, sd_bus_message **ret) {
+static int vtable_append_all_properties(
+                sd_bus *bus,
+                sd_bus_message *reply,
+                const char *path,
+                struct node_vtable *c,
+                void *userdata,
+                sd_bus_error *error) {
+
+        const sd_bus_vtable *v;
         int r;
 
-        /* Returns 0 when we didn't do anything. This should cause the
-         * caller to invoke sd_bus_wait() before returning the next
+        assert(bus);
+        assert(reply);
+        assert(c);
+
+        for (v = c->vtable+1; v->type != _SD_BUS_VTABLE_END; v++) {
+                if (v->type != _SD_BUS_VTABLE_PROPERTY && v->type != _SD_BUS_VTABLE_WRITABLE_PROPERTY)
+                        continue;
+
+                r = sd_bus_message_open_container(reply, 'e', "sv");
+                if (r < 0)
+                        return r;
+
+                r = sd_bus_message_append(reply, "s", c->interface);
+                if (r < 0)
+                        return r;
+
+                r = sd_bus_message_open_container(reply, 'v', v->property.signature);
+                if (r < 0)
+                        return r;
+
+                r = v->property.get(bus, path, c->interface, v->property.member, reply, error, vtable_property_convert_userdata(v, userdata));
+                if (r < 0)
+                        return r;
+
+                if (sd_bus_error_is_set(error))
+                        return 0;
+
+                r = sd_bus_message_close_container(reply);
+                if (r < 0)
+                        return r;
+
+                r = sd_bus_message_close_container(reply);
+                if (r < 0)
+                        return r;
+        }
+
+        return 1;
+}
+
+static int property_get_all_callbacks_run(
+                sd_bus *bus,
+                sd_bus_message *m,
+                struct node_vtable *first,
+                bool require_fallback,
+                const char *iface,
+                bool *found_object) {
+
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        struct node_vtable *c;
+        bool found_interface = false;
+        int r;
+
+        assert(bus);
+        assert(m);
+        assert(found_object);
+
+        r = sd_bus_message_new_method_return(bus, m, &reply);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_open_container(reply, 'a', "{sv}");
+        if (r < 0)
+                return r;
+
+        LIST_FOREACH(vtables, c, first) {
+                _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+                void *u;
+
+                if (require_fallback && !c->is_fallback)
+                        continue;
+
+                r = node_vtable_get_userdata(bus, m->path, c, &u);
+                if (r < 0)
+                        return r;
+                if (r == 0)
+                        continue;
+
+                *found_object = true;
+
+                if (iface && !streq(c->interface, iface))
+                        continue;
+                found_interface = true;
+
+                c->last_iteration = bus->iteration_counter;
+
+                r = vtable_append_all_properties(bus, reply, m->path, c, u, &error);
+                if (r < 0)
+                        return r;
+
+                if (sd_bus_error_is_set(&error)) {
+                        r = sd_bus_reply_method_error(bus, m, &error);
+                        if (r < 0)
+                                return r;
+
+                        return 1;
+                }
+        }
+
+        if (!found_interface) {
+                r = sd_bus_reply_method_errorf(
+                                bus, m,
+                                "org.freedesktop.DBus.Error.UnknownInterface",
+                                "Unknown interface '%s'.", iface);
+                if (r < 0)
+                        return r;
+
+                return 1;
+        }
+
+        r = sd_bus_message_close_container(reply);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_send(bus, reply, NULL);
+        if (r < 0)
+                return r;
+
+        return 1;
+}
+
+static bool bus_node_with_object_manager(sd_bus *bus, struct node *n) {
+        assert(bus);
+
+        if (n->object_manager)
+                return true;
+
+        if (n->parent)
+                return bus_node_with_object_manager(bus, n->parent);
+
+        return false;
+}
+
+static bool bus_node_exists(sd_bus *bus, struct node *n, const char *path, bool require_fallback) {
+        struct node_vtable *c;
+        struct node_callback *k;
+
+        assert(bus);
+        assert(n);
+
+        if (n->child)
+                return true;
+
+        LIST_FOREACH(callbacks, k, n->callbacks) {
+                if (require_fallback && !k->is_fallback)
+                        continue;
+
+                return true;
+        }
+
+        LIST_FOREACH(vtables, c, n->vtables) {
+
+                if (require_fallback && !c->is_fallback)
+                        continue;
+
+                return true;
+        }
+
+        return !require_fallback && (n->enumerators || n->object_manager);
+
+}
+
+static int process_introspect(
+                sd_bus *bus,
+                sd_bus_message *m,
+                struct node *n,
+                bool require_fallback,
+                bool *found_object) {
+
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        _cleanup_set_free_free_ Set *s = NULL;
+        struct introspect intro;
+        struct node_vtable *c;
+        bool empty;
+        int r;
+
+        assert(bus);
+        assert(m);
+        assert(n);
+        assert(found_object);
+
+        r = get_child_nodes(bus, m->path, n, &s);
+        if (r < 0)
+                return r;
+
+        r = introspect_begin(&intro);
+        if (r < 0)
+                return r;
+
+        r = introspect_write_default_interfaces(&intro, bus_node_with_object_manager(bus, n));
+        if (r < 0)
+                return r;
+
+        empty = set_isempty(s);
+
+        LIST_FOREACH(vtables, c, n->vtables) {
+                void *u;
+
+                if (require_fallback && !c->is_fallback)
+                        continue;
+
+                r = node_vtable_get_userdata(bus, m->path, c, &u);
+                if (r < 0)
+                        return r;
+                if (r == 0)
+                        continue;
+
+                empty = false;
+
+                r = introspect_write_interface(&intro, c->interface, c->vtable);
+                if (r < 0)
+                        goto finish;
+        }
+
+        if (empty) {
+                /* Nothing?, let's see if we exist at all, and if not
+                 * refuse to do anything */
+                r = bus_node_exists(bus, n, m->path, require_fallback);
+                if (r < 0)
+                        return r;
+
+                if (r == 0)
+                        goto finish;
+        }
+
+        *found_object = true;
+
+        r = introspect_write_child_nodes(&intro, s, m->path);
+        if (r < 0)
+                goto finish;
+
+        r = introspect_finish(&intro, bus, m, &reply);
+        if (r < 0)
+                goto finish;
+
+        r = sd_bus_send(bus, reply, NULL);
+        if (r < 0)
+                goto finish;
+
+        r = 1;
+
+finish:
+        introspect_free(&intro);
+        return r;
+}
+
+static int object_manager_serialize_vtable(
+                sd_bus *bus,
+                sd_bus_message *reply,
+                const char *path,
+                struct node_vtable *c,
+                sd_bus_error *error) {
+
+        void *u;
+        int r;
+
+        assert(bus);
+        assert(reply);
+        assert(path);
+        assert(c);
+        assert(error);
+
+        r = node_vtable_get_userdata(bus, path, c, &u);
+        if (r <= 0)
+                return r;
+
+        r = sd_bus_message_open_container(reply, 'e', "sa{sv}");
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_append(reply, "s", c->interface);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_open_container(reply, 'a', "{sv}");
+        if (r < 0)
+                return r;
+
+        r = vtable_append_all_properties(bus, reply, path, c, u, error);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_close_container(reply);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_close_container(reply);
+        if (r < 0)
+                return r;
+
+        return 0;
+}
+
+static int object_manager_serialize_path(
+                sd_bus *bus,
+                sd_bus_message *reply,
+                const char *path,
+                bool require_fallback,
+                sd_bus_error *error) {
+
+        struct node_vtable *i;
+        struct node *n;
+        int r;
+
+        assert(bus);
+        assert(reply);
+        assert(path);
+        assert(error);
+
+        n = hashmap_get(bus->nodes, path);
+        if (!n)
+                return 0;
+
+        r = sd_bus_message_open_container(reply, 'e', "oa{sa{sv}}");
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_append(reply, "o", path);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_open_container(reply, 'a', "{sa{sv}}");
+        if (r < 0)
+                return r;
+
+        LIST_FOREACH(vtables, i, n->vtables) {
+
+                if (require_fallback && !i->is_fallback)
+                        continue;
+
+                r = object_manager_serialize_vtable(bus, reply, path, i, error);
+                if (r < 0)
+                        return r;
+                if (sd_bus_error_is_set(error))
+                        return 0;
+        }
+
+        r = sd_bus_message_close_container(reply);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_close_container(reply);
+        if (r < 0)
+                return r;
+
+        return 1;
+}
+
+static int object_manager_serialize_path_and_fallbacks(
+                sd_bus *bus,
+                sd_bus_message *reply,
+                const char *path,
+                sd_bus_error *error) {
+
+        size_t pl;
+        int r;
+
+        assert(bus);
+        assert(reply);
+        assert(path);
+        assert(error);
+
+        /* First, add all vtables registered for this path */
+        r = object_manager_serialize_path(bus, reply, path, false, error);
+        if (r < 0)
+                return r;
+        if (sd_bus_error_is_set(error))
+                return 0;
+
+        /* Second, add fallback vtables registered for any of the prefixes */
+        pl = strlen(path);
+        if (pl > 1) {
+                char p[pl + 1];
+                strcpy(p, path);
+
+                for (;;) {
+                        char *e;
+
+                        e = strrchr(p, '/');
+                        if (e == p || !e)
+                                break;
+
+                        *e = 0;
+
+                        r = object_manager_serialize_path(bus, reply, p, true, error);
+                        if (r < 0)
+                                return r;
+
+                        if (sd_bus_error_is_set(error))
+                                return 0;
+                }
+        }
+
+        return 0;
+}
+
+static int process_get_managed_objects(
+                sd_bus *bus,
+                sd_bus_message *m,
+                struct node *n,
+                bool require_fallback,
+                bool *found_object) {
+
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        _cleanup_set_free_free_ Set *s = NULL;
+        bool empty;
+        int r;
+
+        assert(bus);
+        assert(m);
+        assert(n);
+        assert(found_object);
+
+        if (!bus_node_with_object_manager(bus, n))
+                return 0;
+
+        r = get_child_nodes(bus, m->path, n, &s);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_new_method_return(bus, m, &reply);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_open_container(reply, 'a', "{oa{sa{sv}}}");
+        if (r < 0)
+                return r;
+
+        empty = set_isempty(s);
+        if (empty) {
+                struct node_vtable *c;
+
+                /* Hmm, so we have no children? Then let's check
+                 * whether we exist at all, i.e. whether at least one
+                 * vtable exists. */
+
+                LIST_FOREACH(vtables, c, n->vtables) {
+
+                        if (require_fallback && !c->is_fallback)
+                                continue;
+
+                        if (r < 0)
+                                return r;
+                        if (r == 0)
+                                continue;
+
+                        empty = false;
+                        break;
+                }
+
+                if (empty)
+                        return 0;
+        } else {
+                Iterator i;
+                char *path;
+
+                SET_FOREACH(path, s, i) {
+                        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+
+                        r = object_manager_serialize_path_and_fallbacks(bus, reply, path, &error);
+                        if (r < 0)
+                                return -ENOMEM;
+
+                        if (sd_bus_error_is_set(&error)) {
+                                r = sd_bus_reply_method_error(bus, m, &error);
+                                if (r < 0)
+                                        return r;
+
+                                return 1;
+                        }
+                }
+        }
+
+        r = sd_bus_message_close_container(reply);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_send(bus, reply, NULL);
+        if (r < 0)
+                return r;
+
+        return 1;
+}
+
+static int object_find_and_run(sd_bus *bus, sd_bus_message *m, const char *p, bool require_fallback, bool *found_object) {
+        struct node *n;
+        struct vtable_member vtable_key, *v;
+        int r;
+
+        assert(bus);
+        assert(m);
+        assert(p);
+        assert(found_object);
+
+        n = hashmap_get(bus->nodes, p);
+        if (!n)
+                return 0;
+
+        /* First, try object callbacks */
+        r = node_callbacks_run(bus, m, n->callbacks, require_fallback, found_object);
+        if (r != 0)
+                return r;
+
+        if (!m->interface || !m->member)
+                return 0;
+
+        /* Then, look for a known method */
+        vtable_key.path = (char*) p;
+        vtable_key.interface = m->interface;
+        vtable_key.member = m->member;
+
+        v = hashmap_get(bus->vtable_methods, &vtable_key);
+        if (v) {
+                r = method_callbacks_run(bus, m, v, require_fallback, found_object);
+                if (r != 0)
+                        return r;
+        }
+
+        /* Then, look for a known property */
+        if (streq(m->interface, "org.freedesktop.DBus.Properties")) {
+                bool get = false;
+
+                get = streq(m->member, "Get");
+
+                if (get || streq(m->member, "Set")) {
+
+                        r = sd_bus_message_rewind(m, true);
+                        if (r < 0)
+                                return r;
+
+                        vtable_key.path = (char*) p;
+
+                        r = sd_bus_message_read(m, "ss", &vtable_key.interface, &vtable_key.member);
+                        if (r < 0)
+                                return r;
+
+                        v = hashmap_get(bus->vtable_properties, &vtable_key);
+                        if (v) {
+                                r = property_get_set_callbacks_run(bus, m, v, require_fallback, get, found_object);
+                                if (r != 0)
+                                        return r;
+                        }
+
+                } else if (streq(m->member, "GetAll")) {
+                        const char *iface;
+
+                        r = sd_bus_message_rewind(m, true);
+                        if (r < 0)
+                                return r;
+
+                        r = sd_bus_message_read(m, "s", &iface);
+                        if (r < 0)
+                                return r;
+
+                        if (iface[0] == 0)
+                                iface = NULL;
+
+                        r = property_get_all_callbacks_run(bus, m, n->vtables, require_fallback, iface, found_object);
+                        if (r != 0)
+                                return r;
+                }
+
+        } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) {
+
+                r = process_introspect(bus, m, n, require_fallback, found_object);
+                if (r != 0)
+                        return r;
+
+        } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus.ObjectManager", "GetManagedObjects")) {
+
+                r = process_get_managed_objects(bus, m, n, require_fallback, found_object);
+                if (r != 0)
+                        return r;
+        }
+
+        if (!*found_object) {
+                r = bus_node_exists(bus, n, m->path, require_fallback);
+                if (r < 0)
+                        return r;
+
+                if (r > 0)
+                        *found_object = true;
+        }
+
+        return 0;
+}
+
+static int process_object(sd_bus *bus, sd_bus_message *m) {
+        int r;
+        size_t pl;
+        bool found_object = false;
+
+        assert(bus);
+        assert(m);
+
+        if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
+                return 0;
+
+        if (!m->path)
+                return 0;
+
+        if (hashmap_isempty(bus->nodes))
+                return 0;
+
+        pl = strlen(m->path);
+        do {
+                char p[pl+1];
+
+                bus->nodes_modified = false;
+
+                r = object_find_and_run(bus, m, m->path, false, &found_object);
+                if (r != 0)
+                        return r;
+
+                /* Look for fallback prefixes */
+                strcpy(p, m->path);
+                for (;;) {
+                        char *e;
+
+                        if (streq(p, "/"))
+                                break;
+
+                        if (bus->nodes_modified)
+                                break;
+
+                        e = strrchr(p, '/');
+                        assert(e);
+                        if (e == p)
+                                *(e+1) = 0;
+                        else
+                                *e = 0;
+
+                        r = object_find_and_run(bus, m, p, true, &found_object);
+                        if (r != 0)
+                                return r;
+                }
+
+        } while (bus->nodes_modified);
+
+        if (!found_object)
+                return 0;
+
+        if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Properties", "Get") ||
+            sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Properties", "Set"))
+                r = sd_bus_reply_method_errorf(
+                                bus, m,
+                                "org.freedesktop.DBus.Error.UnknownProperty",
+                                "Unknown property or interface.");
+        else
+                r = sd_bus_reply_method_errorf(
+                                bus, m,
+                                "org.freedesktop.DBus.Error.UnknownMethod",
+                                "Unknown method '%s' or interface '%s'.", m->member, m->interface);
+
+        if (r < 0)
+                return r;
+
+        return 1;
+}
+
+static int process_message(sd_bus *bus, sd_bus_message *m) {
+        int r;
+
+        assert(bus);
+        assert(m);
+
+        bus->iteration_counter++;
+
+        r = process_hello(bus, m);
+        if (r != 0)
+                return r;
+
+        r = process_reply(bus, m);
+        if (r != 0)
+                return r;
+
+        r = process_filter(bus, m);
+        if (r != 0)
+                return r;
+
+        r = process_match(bus, m);
+        if (r != 0)
+                return r;
+
+        r = process_builtin(bus, m);
+        if (r != 0)
+                return r;
+
+        return process_object(bus, m);
+}
+
+static int process_running(sd_bus *bus, sd_bus_message **ret) {
+        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        int 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;
+        }
+
+        if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL) {
+
+                r = sd_bus_reply_method_errorf(
+                                bus, m,
+                                "org.freedesktop.DBus.Error.UnknownObject",
+                                "Unknown object '%s'.", m->path);
+                if (r < 0)
+                        return r;
+        }
+
+        return 1;
+
+null_message:
+        if (r >= 0 && ret)
+                *ret = NULL;
+
+        return r;
+}
+
+int sd_bus_process(sd_bus *bus, sd_bus_message **ret) {
+        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. */
 
-        if (!bus)
-                return -EINVAL;
-        if (bus_pid_changed(bus))
-                return -ECHILD;
+        if (!bus)
+                return -EINVAL;
+        if (bus_pid_changed(bus))
+                return -ECHILD;
+
+        /* We don't allow recursively invoking sd_bus_process(). */
+        if (bus->processing)
+                return -EBUSY;
+
+        switch (bus->state) {
+
+        case BUS_UNSET:
+        case BUS_CLOSED:
+                return -ENOTCONN;
+
+        case BUS_OPENING:
+                r = bus_socket_process_opening(bus);
+                if (r < 0)
+                        return r;
+                if (ret)
+                        *ret = NULL;
+                return r;
+
+        case BUS_AUTHENTICATING:
+
+                r = bus_socket_process_authenticating(bus);
+                if (r < 0)
+                        return r;
+                if (ret)
+                        *ret = NULL;
+                return r;
+
+        case BUS_RUNNING:
+        case BUS_HELLO:
+
+                bus->processing = true;
+                r = process_running(bus, ret);
+                bus->processing = false;
+
+                return r;
+        }
+
+        assert_not_reached("Unknown state");
+}
+
+static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) {
+        struct pollfd p[2] = {};
+        int r, e, n;
+        struct timespec ts;
+        usec_t until, m;
+
+        assert(bus);
+
+        if (!BUS_IS_OPEN(bus->state))
+                return -ENOTCONN;
+
+        e = sd_bus_get_events(bus);
+        if (e < 0)
+                return e;
+
+        if (need_more)
+                e |= POLLIN;
+
+        r = sd_bus_get_timeout(bus, &until);
+        if (r < 0)
+                return r;
+        if (r == 0)
+                m = (uint64_t) -1;
+        else {
+                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;
+
+        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, 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) {
+
+        if (!bus)
+                return -EINVAL;
+        if (!BUS_IS_OPEN(bus->state))
+                return -ENOTCONN;
+        if (bus_pid_changed(bus))
+                return -ECHILD;
+
+        if (bus->rqueue_size > 0)
+                return 0;
+
+        return bus_poll(bus, false, timeout_usec);
+}
+
+int sd_bus_flush(sd_bus *bus) {
+        int r;
+
+        if (!bus)
+                return -EINVAL;
+        if (!BUS_IS_OPEN(bus->state))
+                return -ENOTCONN;
+        if (bus_pid_changed(bus))
+                return -ECHILD;
+
+        r = bus_ensure_running(bus);
+        if (r < 0)
+                return r;
+
+        if (bus->wqueue_size <= 0)
+                return 0;
+
+        for (;;) {
+                r = dispatch_wqueue(bus);
+                if (r < 0)
+                        return r;
+
+                if (bus->wqueue_size <= 0)
+                        return 0;
+
+                r = bus_poll(bus, false, (uint64_t) -1);
+                if (r < 0)
+                        return r;
+        }
+}
+
+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;
+        if (bus_pid_changed(bus))
+                return -ECHILD;
+
+        f = new0(struct filter_callback, 1);
+        if (!f)
+                return -ENOMEM;
+        f->callback = callback;
+        f->userdata = userdata;
+
+        bus->filter_callbacks_modified = true;
+        LIST_PREPEND(struct filter_callback, callbacks, bus->filter_callbacks, f);
+        return 0;
+}
+
+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;
+        if (bus_pid_changed(bus))
+                return -ECHILD;
+
+        LIST_FOREACH(callbacks, f, bus->filter_callbacks) {
+                if (f->callback == callback && f->userdata == userdata) {
+                        bus->filter_callbacks_modified = true;
+                        LIST_REMOVE(struct filter_callback, callbacks, bus->filter_callbacks, f);
+                        free(f);
+                        return 1;
+                }
+        }
+
+        return 0;
+}
+
+static struct node *bus_node_allocate(sd_bus *bus, const char *path) {
+        struct node *n, *parent;
+        const char *e;
+        char *s, *p;
+        int r;
+
+        assert(bus);
+        assert(path);
+        assert(path[0] == '/');
+
+        n = hashmap_get(bus->nodes, path);
+        if (n)
+                return n;
+
+        r = hashmap_ensure_allocated(&bus->nodes, string_hash_func, string_compare_func);
+        if (r < 0)
+                return NULL;
+
+        s = strdup(path);
+        if (!s)
+                return NULL;
+
+        if (streq(path, "/"))
+                parent = NULL;
+        else {
+                e = strrchr(path, '/');
+                assert(e);
+
+                p = strndupa(path, MAX(1, path - e));
+
+                parent = bus_node_allocate(bus, p);
+                if (!parent) {
+                        free(s);
+                        return NULL;
+                }
+        }
+
+        n = new0(struct node, 1);
+        if (!n)
+                return NULL;
+
+        n->parent = parent;
+        n->path = s;
+
+        r = hashmap_put(bus->nodes, s, n);
+        if (r < 0) {
+                free(s);
+                free(n);
+                return NULL;
+        }
+
+        if (parent)
+                LIST_PREPEND(struct node, siblings, parent->child, n);
+
+        return n;
+}
+
+static void bus_node_gc(sd_bus *b, struct node *n) {
+        assert(b);
+
+        if (!n)
+                return;
+
+        if (n->child ||
+            n->callbacks ||
+            n->vtables ||
+            n->enumerators ||
+            n->object_manager)
+                return;
+
+        assert(hashmap_remove(b->nodes, n->path) == n);
+
+        if (n->parent)
+                LIST_REMOVE(struct node, siblings, n->parent->child, n);
+
+        free(n->path);
+        bus_node_gc(b, n->parent);
+        free(n);
+}
+
+static int bus_add_object(
+                sd_bus *b,
+                bool fallback,
+                const char *path,
+                sd_bus_message_handler_t callback,
+                void *userdata) {
+
+        struct node_callback *c;
+        struct node *n;
+        int r;
+
+        if (!b)
+                return -EINVAL;
+        if (!object_path_is_valid(path))
+                return -EINVAL;
+        if (!callback)
+                return -EINVAL;
+        if (bus_pid_changed(b))
+                return -ECHILD;
+
+        n = bus_node_allocate(b, path);
+        if (!n)
+                return -ENOMEM;
+
+        c = new0(struct node_callback, 1);
+        if (!c) {
+                r = -ENOMEM;
+                goto fail;
+        }
+
+        c->node = n;
+        c->callback = callback;
+        c->userdata = userdata;
+        c->is_fallback = fallback;
+
+        LIST_PREPEND(struct node_callback, callbacks, n->callbacks, c);
+        return 0;
+
+fail:
+        free(c);
+        bus_node_gc(b, n);
+        return r;
+}
+
+static int bus_remove_object(
+                sd_bus *bus,
+                bool fallback,
+                const char *path,
+                sd_bus_message_handler_t callback,
+                void *userdata) {
+
+        struct node_callback *c;
+        struct node *n;
+
+        if (!bus)
+                return -EINVAL;
+        if (!object_path_is_valid(path))
+                return -EINVAL;
+        if (!callback)
+                return -EINVAL;
+        if (bus_pid_changed(bus))
+                return -ECHILD;
+
+        n = hashmap_get(bus->nodes, path);
+        if (!n)
+                return 0;
+
+        LIST_FOREACH(callbacks, c, n->callbacks)
+                if (c->callback == callback && c->userdata == userdata && c->is_fallback == fallback)
+                        break;
+        if (!c)
+                return 0;
+
+        LIST_REMOVE(struct node_callback, callbacks, n->callbacks, c);
+        free(c);
+
+        bus_node_gc(bus, n);
+
+        return 1;
+}
+
+int sd_bus_add_object(sd_bus *bus, const char *path, sd_bus_message_handler_t callback, void *userdata) {
+        return bus_add_object(bus, false, path, callback, userdata);
+}
+
+int sd_bus_remove_object(sd_bus *bus, const char *path, sd_bus_message_handler_t callback, void *userdata) {
+        return bus_remove_object(bus, false, path, callback, userdata);
+}
+
+int sd_bus_add_fallback(sd_bus *bus, const char *prefix, sd_bus_message_handler_t callback, void *userdata) {
+        return bus_add_object(bus, true, prefix, callback, userdata);
+}
+
+int sd_bus_remove_fallback(sd_bus *bus, const char *prefix, sd_bus_message_handler_t callback, void *userdata) {
+        return bus_remove_object(bus, true, prefix, callback, userdata);
+}
+
+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;
+
+        if (!bus)
+                return -EINVAL;
+        if (!match)
+                return -EINVAL;
+        if (bus_pid_changed(bus))
+                return -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;
+}
+
+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;
+
+        if (!bus)
+                return -EINVAL;
+        if (!match)
+                return -EINVAL;
+        if (bus_pid_changed(bus))
+                return -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;
+}
+
+int sd_bus_emit_signal(
+                sd_bus *bus,
+                const char *path,
+                const char *interface,
+                const char *member,
+                const char *types, ...) {
+
+        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        va_list ap;
+        int r;
+
+        if (!bus)
+                return -EINVAL;
+        if (!BUS_IS_OPEN(bus->state))
+                return -ENOTCONN;
+        if (bus_pid_changed(bus))
+                return -ECHILD;
+
+        r = sd_bus_message_new_signal(bus, path, interface, member, &m);
+        if (r < 0)
+                return r;
+
+        va_start(ap, types);
+        r = bus_message_append_ap(m, types, ap);
+        va_end(ap);
+        if (r < 0)
+                return r;
+
+        return sd_bus_send(bus, m, NULL);
+}
+
+int sd_bus_call_method(
+                sd_bus *bus,
+                const char *destination,
+                const char *path,
+                const char *interface,
+                const char *member,
+                sd_bus_error *error,
+                sd_bus_message **reply,
+                const char *types, ...) {
+
+        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        va_list ap;
+        int r;
+
+        if (!bus)
+
+                return -EINVAL;
+        if (!BUS_IS_OPEN(bus->state))
+                return -ENOTCONN;
+        if (bus_pid_changed(bus))
+                return -ECHILD;
+
+        r = sd_bus_message_new_method_call(bus, destination, path, interface, member, &m);
+        if (r < 0)
+                return r;
+
+        va_start(ap, types);
+        r = bus_message_append_ap(m, types, ap);
+        va_end(ap);
+        if (r < 0)
+                return r;
+
+        return sd_bus_send_with_reply_and_block(bus, m, 0, error, reply);
+}
+
+int sd_bus_reply_method_return(
+                sd_bus *bus,
+                sd_bus_message *call,
+                const char *types, ...) {
+
+        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        va_list ap;
+        int r;
+
+        if (!bus)
+                return -EINVAL;
+        if (!call)
+                return -EINVAL;
+        if (!call->sealed)
+                return -EPERM;
+        if (call->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
+                return -EINVAL;
+        if (!BUS_IS_OPEN(bus->state))
+                return -ENOTCONN;
+        if (bus_pid_changed(bus))
+                return -ECHILD;
+
+        if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+                return 0;
+
+        r = sd_bus_message_new_method_return(bus, call, &m);
+        if (r < 0)
+                return r;
+
+        va_start(ap, types);
+        r = bus_message_append_ap(m, types, ap);
+        va_end(ap);
+        if (r < 0)
+                return r;
+
+        return sd_bus_send(bus, m, NULL);
+}
+
+int sd_bus_reply_method_error(
+                sd_bus *bus,
+                sd_bus_message *call,
+                const sd_bus_error *e) {
+
+        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        int r;
+
+        if (!bus)
+                return -EINVAL;
+        if (!call)
+                return -EINVAL;
+        if (!call->sealed)
+                return -EPERM;
+        if (call->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
+                return -EINVAL;
+        if (!sd_bus_error_is_set(e))
+                return -EINVAL;
+        if (!BUS_IS_OPEN(bus->state))
+                return -ENOTCONN;
+        if (bus_pid_changed(bus))
+                return -ECHILD;
+
+        if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+                return 0;
+
+        r = sd_bus_message_new_method_error(bus, call, e, &m);
+        if (r < 0)
+                return r;
+
+        return sd_bus_send(bus, m, NULL);
+}
+
+int sd_bus_reply_method_errorf(
+                sd_bus *bus,
+                sd_bus_message *call,
+                const char *name,
+                const char *format,
+                ...) {
+
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        char *n, *m;
+        va_list ap;
+        int r;
+
+        n = strdup(name);
+        if (!n)
+                return -ENOMEM;
+
+        if (format) {
+                va_start(ap, format);
+                r = vasprintf(&m, format, ap);
+                va_end(ap);
+
+                if (r < 0) {
+                        free(n);
+                        return -ENOMEM;
+                }
+        }
+
+        error.name = n;
+        error.message = m;
+        error.need_free = true;
+
+        return sd_bus_reply_method_error(bus, call, &error);
+}
+
+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 void free_node_vtable(sd_bus *bus, struct node_vtable *w) {
+        assert(bus);
+
+        if (!w)
+                return;
+
+        if (w->interface && w->node && w->vtable) {
+                const sd_bus_vtable *v;
+
+                for (v = w->vtable; v->type != _SD_BUS_VTABLE_END; w++) {
+                        struct vtable_member *x = NULL;
+
+                        switch (v->type) {
+
+                        case _SD_BUS_VTABLE_METHOD: {
+                                struct vtable_member key;
+
+                                key.path = w->node->path;
+                                key.interface = w->interface;
+                                key.member = v->method.member;
+
+                                x = hashmap_remove(bus->vtable_methods, &key);
+                                break;
+                        }
+
+                        case _SD_BUS_VTABLE_PROPERTY:
+                        case _SD_BUS_VTABLE_WRITABLE_PROPERTY: {
+                                struct vtable_member key;
+
+                                key.path = w->node->path;
+                                key.interface = w->interface;
+                                key.member = v->property.member;
+                                x = hashmap_remove(bus->vtable_properties, &key);
+                                break;
+                        }}
+
+                        free(x);
+                }
+        }
+
+        free(w->interface);
+        free(w);
+}
+
+static unsigned vtable_member_hash_func(const void *a) {
+        const struct vtable_member *m = a;
+
+        return
+                string_hash_func(m->path) ^
+                string_hash_func(m->interface) ^
+                string_hash_func(m->member);
+}
+
+static int vtable_member_compare_func(const void *a, const void *b) {
+        const struct vtable_member *x = a, *y = b;
+        int r;
+
+        r = strcmp(x->path, y->path);
+        if (r != 0)
+                return r;
+
+        r = strcmp(x->interface, y->interface);
+        if (r != 0)
+                return r;
+
+        return strcmp(x->member, y->member);
+}
+
+static int add_object_vtable_internal(
+                sd_bus *bus,
+                const char *path,
+                const char *interface,
+                const sd_bus_vtable *vtable,
+                bool fallback,
+                sd_bus_object_find_t find,
+                void *userdata) {
+
+        struct node_vtable *c, *i;
+        const sd_bus_vtable *v;
+        struct node *n;
+        int r;
+
+        if (!bus)
+                return -EINVAL;
+        if (!object_path_is_valid(path))
+                return -EINVAL;
+        if (!interface_name_is_valid(interface))
+                return -EINVAL;
+        if (!vtable || vtable[0].type != _SD_BUS_VTABLE_START || vtable[0].start.element_size != sizeof(struct sd_bus_vtable))
+                return -EINVAL;
+        if (bus_pid_changed(bus))
+                return -ECHILD;
+
+        r = hashmap_ensure_allocated(&bus->vtable_methods, vtable_member_hash_func, vtable_member_compare_func);
+        if (r < 0)
+                return r;
+
+        r = hashmap_ensure_allocated(&bus->vtable_properties, vtable_member_hash_func, vtable_member_compare_func);
+        if (r < 0)
+                return r;
+
+        n = bus_node_allocate(bus, path);
+        if (!n)
+                return -ENOMEM;
+
+        LIST_FOREACH(vtables, i, n->vtables) {
+                if (streq(i->interface, interface)) {
+                        r = -EEXIST;
+                        goto fail;
+                }
+
+                if (i->is_fallback != fallback) {
+                        r = -EPROTOTYPE;
+                        goto fail;
+                }
+        }
+
+        c = new0(struct node_vtable, 1);
+        if (!c) {
+                r = -ENOMEM;
+                goto fail;
+        }
 
-        /* We don't allow recursively invoking sd_bus_process(). */
-        if (bus->processing)
-                return -EBUSY;
+        c->node = n;
+        c->is_fallback = fallback;
+        c->vtable = vtable;
+        c->userdata = userdata;
+        c->find = find;
 
-        switch (bus->state) {
+        c->interface = strdup(interface);
+        if (!c->interface) {
+                r = -ENOMEM;
+                goto fail;
+        }
 
-        case BUS_UNSET:
-        case BUS_CLOSED:
-                return -ENOTCONN;
+        for (v = c->vtable+1; v->type != _SD_BUS_VTABLE_END; v++) {
 
-        case BUS_OPENING:
-                r = bus_socket_process_opening(bus);
-                if (r < 0)
-                        return r;
-                if (ret)
-                        *ret = NULL;
-                return r;
+                switch (v->type) {
 
-        case BUS_AUTHENTICATING:
+                case _SD_BUS_VTABLE_METHOD: {
+                        struct vtable_member *m;
 
-                r = bus_socket_process_authenticating(bus);
-                if (r < 0)
-                        return r;
-                if (ret)
-                        *ret = NULL;
-                return r;
+                        if (!member_name_is_valid(v->method.member) ||
+                            !signature_is_valid(v->method.signature, false) ||
+                            !signature_is_valid(v->method.result, false) ||
+                            !v->method.handler ||
+                            v->flags & (SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE|SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY)) {
+                                r = -EINVAL;
+                                goto fail;
+                        }
 
-        case BUS_RUNNING:
-        case BUS_HELLO:
+                        m = new0(struct vtable_member, 1);
+                        if (!m) {
+                                r = -ENOMEM;
+                                goto fail;
+                        }
 
-                bus->processing = true;
-                r = process_running(bus, ret);
-                bus->processing = false;
+                        m->parent = c;
+                        m->path = n->path;
+                        m->interface = c->interface;
+                        m->member = v->method.member;
+                        m->vtable = v;
 
-                return r;
-        }
+                        r = hashmap_put(bus->vtable_methods, m, m);
+                        if (r < 0) {
+                                free(m);
+                                goto fail;
+                        }
 
-        assert_not_reached("Unknown state");
-}
+                        break;
+                }
 
-static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) {
-        struct pollfd p[2] = {};
-        int r, e, n;
-        struct timespec ts;
-        usec_t until, m;
+                case _SD_BUS_VTABLE_PROPERTY:
+                case _SD_BUS_VTABLE_WRITABLE_PROPERTY: {
+                        struct vtable_member *m;
 
-        assert(bus);
+                        if (!member_name_is_valid(v->property.member) ||
+                            !signature_is_single(v->property.signature, false) ||
+                            v->flags & SD_BUS_VTABLE_METHOD_NO_REPLY ||
+                            (v->flags & SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY && !(v->flags & SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE))) {
+                                r = -EINVAL;
+                                goto fail;
+                        }
 
-        if (!BUS_IS_OPEN(bus->state))
-                return -ENOTCONN;
 
-        e = sd_bus_get_events(bus);
-        if (e < 0)
-                return e;
+                        m = new0(struct vtable_member, 1);
+                        if (!m) {
+                                r = -ENOMEM;
+                                goto fail;
+                        }
 
-        if (need_more)
-                e |= POLLIN;
+                        m->parent = c;
+                        m->path = n->path;
+                        m->interface = c->interface;
+                        m->member = v->property.member;
+                        m->vtable = v;
 
-        r = sd_bus_get_timeout(bus, &until);
-        if (r < 0)
-                return r;
-        if (r == 0)
-                m = (uint64_t) -1;
-        else {
-                usec_t nw;
-                nw = now(CLOCK_MONOTONIC);
-                m = until > nw ? until - nw : 0;
-        }
+                        r = hashmap_put(bus->vtable_properties, m, m);
+                        if (r < 0) {
+                                free(m);
+                                goto fail;
+                        }
 
-        if (timeout_usec != (uint64_t) -1 && (m == (uint64_t) -1 || timeout_usec < m))
-                m = timeout_usec;
+                        break;
+                }
 
-        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;
+                case _SD_BUS_VTABLE_SIGNAL:
+
+                        if (!member_name_is_valid(v->signal.member) ||
+                            !signature_is_single(v->signal.signature, false)) {
+                                r = -EINVAL;
+                                goto fail;
+                        }
+
+                        break;
+
+                default:
+                        r = -EINVAL;
+                        goto fail;
+                }
         }
 
-        r = ppoll(p, n, m == (uint64_t) -1 ? NULL : timespec_store(&ts, m), NULL);
-        if (r < 0)
-                return -errno;
+        LIST_PREPEND(struct node_vtable, vtables, n->vtables, c);
+        return 0;
 
-        return r > 0 ? 1 : 0;
+fail:
+        if (c)
+                free_node_vtable(bus, c);
+
+        bus_node_gc(bus, n);
+        return 0;
 }
 
-int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec) {
+static int remove_object_vtable_internal(
+                sd_bus *bus,
+                const char *path,
+                const char *interface,
+                bool fallback) {
+
+        struct node_vtable *c;
+        struct node *n;
 
         if (!bus)
                 return -EINVAL;
-        if (!BUS_IS_OPEN(bus->state))
-                return -ENOTCONN;
+        if (!object_path_is_valid(path))
+                return -EINVAL;
+        if (!interface_name_is_valid(interface))
+                return -EINVAL;
         if (bus_pid_changed(bus))
                 return -ECHILD;
 
-        if (bus->rqueue_size > 0)
+        n = hashmap_get(bus->nodes, path);
+        if (!n)
                 return 0;
 
-        return bus_poll(bus, false, timeout_usec);
-}
+        LIST_FOREACH(vtables, c, n->vtables)
+                if (streq(c->interface, interface) && c->is_fallback == fallback)
+                        break;
 
-int sd_bus_flush(sd_bus *bus) {
-        int r;
+        if (!c)
+                return 0;
 
-        if (!bus)
-                return -EINVAL;
-        if (!BUS_IS_OPEN(bus->state))
-                return -ENOTCONN;
-        if (bus_pid_changed(bus))
-                return -ECHILD;
+        LIST_REMOVE(struct node_vtable, vtables, n->vtables, c);
 
-        r = bus_ensure_running(bus);
-        if (r < 0)
-                return r;
+        free_node_vtable(bus, c);
+        return 1;
+}
 
-        if (bus->wqueue_size <= 0)
-                return 0;
+int sd_bus_add_object_vtable(
+                sd_bus *bus,
+                const char *path,
+                const char *interface,
+                const sd_bus_vtable *vtable,
+                void *userdata) {
 
-        for (;;) {
-                r = dispatch_wqueue(bus);
-                if (r < 0)
-                        return r;
+        return add_object_vtable_internal(bus, path, interface, vtable, false, NULL, userdata);
+}
 
-                if (bus->wqueue_size <= 0)
-                        return 0;
+int sd_bus_remove_object_vtable(
+                sd_bus *bus,
+                const char *path,
+                const char *interface) {
 
-                r = bus_poll(bus, false, (uint64_t) -1);
-                if (r < 0)
-                        return r;
-        }
+        return remove_object_vtable_internal(bus, path, interface, false);
 }
 
-int sd_bus_add_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata) {
-        struct filter_callback *f;
+int sd_bus_add_fallback_vtable(
+                sd_bus *bus,
+                const char *path,
+                const char *interface,
+                const sd_bus_vtable *vtable,
+                sd_bus_object_find_t find,
+                void *userdata) {
 
-        if (!bus)
-                return -EINVAL;
-        if (!callback)
-                return -EINVAL;
-        if (bus_pid_changed(bus))
-                return -ECHILD;
+        return add_object_vtable_internal(bus, path, interface, vtable, true, find, userdata);
+}
 
-        f = new0(struct filter_callback, 1);
-        if (!f)
-                return -ENOMEM;
-        f->callback = callback;
-        f->userdata = userdata;
+int sd_bus_remove_fallback_vtable(
+                sd_bus *bus,
+                const char *path,
+                const char *interface) {
 
-        bus->filter_callbacks_modified = true;
-        LIST_PREPEND(struct filter_callback, callbacks, bus->filter_callbacks, f);
-        return 0;
+        return remove_object_vtable_internal(bus, path, interface, true);
 }
 
-int sd_bus_remove_filter(sd_bus *bus, sd_bus_message_handler_t callback, void *userdata) {
-        struct filter_callback *f;
+int sd_bus_add_node_enumerator(
+                sd_bus *bus,
+                const char *path,
+                sd_bus_node_enumerator_t callback,
+                void *userdata) {
+
+        struct node_enumerator *c;
+        struct node *n;
+        int r;
 
         if (!bus)
                 return -EINVAL;
+        if (!object_path_is_valid(path))
+                return -EINVAL;
         if (!callback)
                 return -EINVAL;
         if (bus_pid_changed(bus))
                 return -ECHILD;
 
-        LIST_FOREACH(callbacks, f, bus->filter_callbacks) {
-                if (f->callback == callback && f->userdata == userdata) {
-                        bus->filter_callbacks_modified = true;
-                        LIST_REMOVE(struct filter_callback, callbacks, bus->filter_callbacks, f);
-                        free(f);
-                        return 1;
-                }
+        n = bus_node_allocate(bus, path);
+        if (!n)
+                return -ENOMEM;
+
+        c = new0(struct node_enumerator, 1);
+        if (!c) {
+                r = -ENOMEM;
+                goto fail;
         }
 
+        c->node = n;
+        c->callback = callback;
+        c->userdata = userdata;
+
+        LIST_PREPEND(struct node_enumerator, enumerators, n->enumerators, c);
         return 0;
+
+fail:
+        free(c);
+        bus_node_gc(bus, n);
+        return r;
 }
 
-static int bus_add_object(
+int sd_bus_remove_node_enumerator(
                 sd_bus *bus,
-                bool fallback,
                 const char *path,
-                sd_bus_message_handler_t callback,
+                sd_bus_node_enumerator_t callback,
                 void *userdata) {
 
-        struct object_callback *c;
-        int r;
+        struct node_enumerator *c;
+        struct node *n;
 
         if (!bus)
                 return -EINVAL;
-        if (!path)
+        if (!object_path_is_valid(path))
                 return -EINVAL;
         if (!callback)
                 return -EINVAL;
         if (bus_pid_changed(bus))
                 return -ECHILD;
 
-        r = hashmap_ensure_allocated(&bus->object_callbacks, string_hash_func, string_compare_func);
+        n = hashmap_get(bus->nodes, path);
+        if (!n)
+                return 0;
+
+        LIST_FOREACH(enumerators, c, n->enumerators)
+                if (c->callback == callback && c->userdata == userdata)
+                        break;
+
+        if (!c)
+                return 0;
+
+        LIST_REMOVE(struct node_enumerator, enumerators, n->enumerators, c);
+        free(c);
+
+        bus_node_gc(bus, n);
+
+        return 1;
+}
+
+static int emit_properties_changed_on_interface(
+                sd_bus *bus,
+                const char *prefix,
+                const char *path,
+                const char *interface,
+                bool require_fallback,
+                char **names) {
+
+        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        bool has_invalidating = false;
+        struct vtable_member key;
+        struct node_vtable *c;
+        struct node *n;
+        char **property;
+        void *u;
+        int r;
+
+        assert(bus);
+        assert(path);
+        assert(interface);
+
+        n = hashmap_get(bus->nodes, prefix);
+        if (!n)
+                return 0;
+
+        LIST_FOREACH(vtables, c, n->vtables) {
+                if (require_fallback && !c->is_fallback)
+                        continue;
+
+                if (streq(c->interface, interface))
+                        break;
+
+                r = node_vtable_get_userdata(bus, path, c, &u);
+                if (r < 0)
+                        return r;
+                if (r > 0)
+                        break;
+        }
+
+        if (!c)
+                return 0;
+
+        r = sd_bus_message_new_signal(bus, path, "org.freedesktop.DBus", "PropertiesChanged", &m);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_append(m, "s", interface);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_open_container(m, 'a', "{sv}");
         if (r < 0)
                 return r;
 
-        c = new0(struct object_callback, 1);
-        if (!c)
-                return -ENOMEM;
+        key.path = prefix;
+        key.interface = interface;
 
-        c->path = strdup(path);
-        if (!c->path) {
-                free(c);
-                return -ENOMEM;
-        }
+        STRV_FOREACH(property, names) {
+                _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+                struct vtable_member *v;
 
-        c->callback = callback;
-        c->userdata = userdata;
-        c->is_fallback = fallback;
+                key.member = *property;
+                v = hashmap_get(bus->vtable_properties, &key);
+                if (!v)
+                        return -ENOENT;
 
-        bus->object_callbacks_modified = true;
-        r = hashmap_put(bus->object_callbacks, c->path, c);
-        if (r < 0) {
-                free(c->path);
-                free(c);
-                return r;
-        }
+                assert(c == v->parent);
 
-        return 0;
-}
+                if (!(v->vtable->flags & SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE))
+                        return -EDOM;
+                if (v->vtable->flags & SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY) {
+                        has_invalidating = true;
+                        continue;
+                }
 
-static int bus_remove_object(
-                sd_bus *bus,
-                bool fallback,
-                const char *path,
-                sd_bus_message_handler_t callback,
-                void *userdata) {
+                r = sd_bus_message_open_container(m, 'e', "sv");
+                if (r < 0)
+                        return r;
 
-        struct object_callback *c;
+                r = sd_bus_message_append(m, "s", *n);
+                if (r < 0)
+                        return r;
 
-        if (!bus)
-                return -EINVAL;
-        if (!path)
-                return -EINVAL;
-        if (!callback)
-                return -EINVAL;
-        if (bus_pid_changed(bus))
-                return -ECHILD;
+                r = sd_bus_message_open_container(m, 'v', v->vtable->property.signature);
+                if (r < 0)
+                        return r;
 
-        c = hashmap_get(bus->object_callbacks, path);
-        if (!c)
-                return 0;
+                r = v->vtable->property.get(bus, m->path, interface, *property, m, &error, u);
+                if (r < 0)
+                        return r;
 
-        if (c->callback != callback || c->userdata != userdata || c->is_fallback != fallback)
-                return 0;
+                if (sd_bus_error_is_set(&error))
+                        return bus_error_to_errno(&error);
 
-        bus->object_callbacks_modified = true;
-        assert_se(c == hashmap_remove(bus->object_callbacks, c->path));
+                r = sd_bus_message_close_container(m);
+                if (r < 0)
+                        return r;
 
-        free(c->path);
-        free(c);
+                r = sd_bus_message_close_container(m);
+                if (r < 0)
+                        return r;
+        }
 
-        return 1;
-}
+        r = sd_bus_message_close_container(m);
+        if (r < 0)
+                return r;
 
-int sd_bus_add_object(sd_bus *bus, const char *path, sd_bus_message_handler_t callback, void *userdata) {
-        return bus_add_object(bus, false, path, callback, userdata);
-}
+        r = sd_bus_message_open_container(m, 'a', "s");
+        if (r < 0)
+                return r;
 
-int sd_bus_remove_object(sd_bus *bus, const char *path, sd_bus_message_handler_t callback, void *userdata) {
-        return bus_remove_object(bus, false, path, callback, userdata);
-}
+        if (has_invalidating) {
+                STRV_FOREACH(property, names) {
+                        struct vtable_member *v;
 
-int sd_bus_add_fallback(sd_bus *bus, const char *prefix, sd_bus_message_handler_t callback, void *userdata) {
-        return bus_add_object(bus, true, prefix, callback, userdata);
-}
+                        key.member = *property;
+                        assert_se(v = hashmap_get(bus->vtable_properties, &key));
+                        assert(c == v->parent);
 
-int sd_bus_remove_fallback(sd_bus *bus, const char *prefix, sd_bus_message_handler_t callback, void *userdata) {
-        return bus_remove_object(bus, true, prefix, callback, userdata);
+                        if (!(v->vtable->flags & SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY))
+                                continue;
+
+                        r = sd_bus_message_append(m, "s", *property);
+                        if (r < 0)
+                                return r;
+                }
+        }
+
+        r = sd_bus_message_close_container(m);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_send(bus, m, NULL);
+        if (r < 0)
+                return r;
+
+        return 1;
 }
 
-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;
+int sd_bus_emit_properties_changed_strv(sd_bus *bus, const char *path, const char *interface, char **names) {
+        size_t pl;
+        int r;
 
         if (!bus)
                 return -EINVAL;
-        if (!match)
+        if (!object_path_is_valid(path))
+                return -EINVAL;
+        if (!interface_name_is_valid(interface))
                 return -EINVAL;
-        if (bus_pid_changed(bus))
-                return -ECHILD;
 
-        r = bus_match_parse(match, &components, &n_components);
-        if (r < 0)
-                goto finish;
+        r = emit_properties_changed_on_interface(bus, path, path, interface, false, names);
+        if (r != 0)
+                return r;
 
-        if (bus->bus_client) {
-                cookie = ++bus->match_cookie;
+        pl = strlen(path);
+        if (pl > 1 ) {
+                char p[pl+1];
 
-                r = bus_add_match_internal(bus, match, components, n_components, cookie);
-                if (r < 0)
-                        goto finish;
-        }
+                strcpy(p, path);
+                for (;;) {
+                        char *e;
 
-        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);
+                        if (streq(p, "/"))
+                                break;
+
+                        e = strrchr(p, '/');
+                        assert(e);
+                        if (e == p)
+                                *(e+1) = 0;
+                        else
+                                *e = 0;
+
+                        r = emit_properties_changed_on_interface(bus, p, path, interface, true, names);
+                        if (r != 0)
+                                return r;
+                }
         }
 
-finish:
-        bus_match_parse_free(components, n_components);
-        return r;
+        return -ENOENT;
 }
 
-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;
-
-        if (!bus)
-                return -EINVAL;
-        if (!match)
-                return -EINVAL;
-        if (bus_pid_changed(bus))
-                return -ECHILD;
+int sd_bus_emit_properties_changed(sd_bus *bus, const char *path, const char *interface, const char *name, ...)  {
+        _cleanup_strv_free_ char **names = NULL;
+        va_list ap;
 
-        r = bus_match_parse(match, &components, &n_components);
-        if (r < 0)
-                return r;
+        va_start(ap, name);
+        names = strv_new_ap(name, ap);
+        va_end(ap);
 
-        bus->match_callbacks_modified = true;
-        r = bus_match_remove(&bus->match_callbacks, components, n_components, callback, userdata, &cookie);
+        if (!names)
+                return -ENOMEM;
 
-        if (bus->bus_client)
-                q = bus_remove_match_internal(bus, match, cookie);
+        return sd_bus_emit_properties_changed_strv(bus, path, interface, names);
+}
 
-        bus_match_parse_free(components, n_components);
+int sd_bus_emit_interfaces_added(sd_bus *bus, const char *path, const char *interfaces, ...) {
+        return -ENOSYS;
+}
 
-        return r < 0 ? r : q;
+int sd_bus_emit_interfaces_removed(sd_bus *bus, const char *path, const char *interfaces, ...) {
+        return -ENOSYS;
 }
 
-int sd_bus_emit_signal(
+int sd_bus_get_property(
                 sd_bus *bus,
+                const char *destination,
                 const char *path,
                 const char *interface,
                 const char *member,
-                const char *types, ...) {
+                sd_bus_error *error,
+                sd_bus_message **reply,
+                const char *type) {
 
-        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
-        va_list ap;
+        sd_bus_message *rep = NULL;
         int r;
 
-        if (!bus)
+        if (interface && !interface_name_is_valid(interface))
+                return -EINVAL;
+        if (!member_name_is_valid(member))
+                return -EINVAL;
+        if (!signature_is_single(type, false))
+                return -EINVAL;
+        if (!reply)
                 return -EINVAL;
-        if (!BUS_IS_OPEN(bus->state))
-                return -ENOTCONN;
-        if (bus_pid_changed(bus))
-                return -ECHILD;
 
-        r = sd_bus_message_new_signal(bus, path, interface, member, &m);
+        r = sd_bus_call_method(bus, destination, path, "org.freedesktop.DBus.Properties", "Get", error, &rep, "ss", strempty(interface), member);
         if (r < 0)
                 return r;
 
-        va_start(ap, types);
-        r = bus_message_append_ap(m, types, ap);
-        va_end(ap);
-        if (r < 0)
+        r = sd_bus_message_enter_container(rep, 'v', type);
+        if (r < 0) {
+                sd_bus_message_unref(rep);
                 return r;
+        }
 
-        return sd_bus_send(bus, m, NULL);
+        *reply = rep;
+        return 0;
 }
 
-int sd_bus_call_method(
+int sd_bus_set_property(
                 sd_bus *bus,
                 const char *destination,
                 const char *path,
                 const char *interface,
                 const char *member,
                 sd_bus_error *error,
-                sd_bus_message **reply,
-                const char *types, ...) {
+                const char *type, ...) {
 
         _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
         va_list ap;
         int r;
 
-        if (!bus)
-
+        if (interface && !interface_name_is_valid(interface))
+                return -EINVAL;
+        if (!member_name_is_valid(member))
+                return -EINVAL;
+        if (!signature_is_single(type, false))
                 return -EINVAL;
-        if (!BUS_IS_OPEN(bus->state))
-                return -ENOTCONN;
-        if (bus_pid_changed(bus))
-                return -ECHILD;
 
-        r = sd_bus_message_new_method_call(bus, destination, path, interface, member, &m);
+        r = sd_bus_message_new_method_call(bus, destination, path, "org.freedesktop.DBus.Properties", "Set", &m);
         if (r < 0)
                 return r;
 
-        va_start(ap, types);
-        r = bus_message_append_ap(m, types, ap);
+        r = sd_bus_message_append(m, "ss", strempty(interface), member);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_open_container(m, 'v', type);
+        if (r < 0)
+                return r;
+
+        va_start(ap, type);
+        r = bus_message_append_ap(m, type, ap);
         va_end(ap);
         if (r < 0)
                 return r;
 
-        return sd_bus_send_with_reply_and_block(bus, m, 0, error, reply);
-}
+        r = sd_bus_message_close_container(m);
+        if (r < 0)
+                return r;
 
-int sd_bus_reply_method_return(
-                sd_bus *bus,
-                sd_bus_message *call,
-                const char *types, ...) {
+        return sd_bus_send_with_reply_and_block(bus, m, 0, error, NULL);
+}
 
-        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
-        va_list ap;
-        int r;
+int sd_bus_add_object_manager(sd_bus *bus, const char *path) {
+        struct node *n;
 
         if (!bus)
                 return -EINVAL;
-        if (!call)
-                return -EINVAL;
-        if (!call->sealed)
-                return -EPERM;
-        if (call->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
+        if (!object_path_is_valid(path))
                 return -EINVAL;
-        if (!BUS_IS_OPEN(bus->state))
-                return -ENOTCONN;
         if (bus_pid_changed(bus))
                 return -ECHILD;
 
-        if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
-                return 0;
-
-        r = sd_bus_message_new_method_return(bus, call, &m);
-        if (r < 0)
-                return r;
-
-        va_start(ap, types);
-        r = bus_message_append_ap(m, types, ap);
-        va_end(ap);
-        if (r < 0)
-                return r;
+        n = bus_node_allocate(bus, path);
+        if (!n)
+                return -ENOMEM;
 
-        return sd_bus_send(bus, m, NULL);
+        n->object_manager = true;
+        return 0;
 }
 
-int sd_bus_reply_method_error(
-                sd_bus *bus,
-                sd_bus_message *call,
-                const sd_bus_error *e) {
-
-        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
-        int r;
+int sd_bus_remove_object_manager(sd_bus *bus, const char *path) {
+        struct node *n;
 
         if (!bus)
                 return -EINVAL;
-        if (!call)
-                return -EINVAL;
-        if (!call->sealed)
-                return -EPERM;
-        if (call->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
-                return -EINVAL;
-        if (!sd_bus_error_is_set(e))
+        if (!object_path_is_valid(path))
                 return -EINVAL;
-        if (!BUS_IS_OPEN(bus->state))
-                return -ENOTCONN;
         if (bus_pid_changed(bus))
                 return -ECHILD;
 
-        if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+        n = hashmap_get(bus->nodes, path);
+        if (!n)
                 return 0;
 
-        r = sd_bus_message_new_method_error(bus, call, e, &m);
-        if (r < 0)
-                return r;
-
-        return sd_bus_send(bus, m, NULL);
-}
-
-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. */
+        if (!n->object_manager)
+                return 0;
 
-        return bus->original_pid != getpid();
+        n->object_manager = false;
+        bus_node_gc(bus, n);
+        return 1;
 }