X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-objects.c;h=31d761e2154a98b18ef3e7432fb57b5481f15bc6;hp=c306c54df67795290069c7aea9c3a47992dc416c;hb=250a918dc4c8a15d927deecc3b3f6a0604657ae4;hpb=8e4e652b92c8c2f640f8ac1c839dd4a0fd11f3c4

diff --git a/src/libsystemd-bus/bus-objects.c b/src/libsystemd-bus/bus-objects.c
index c306c54df..31d761e21 100644
--- a/src/libsystemd-bus/bus-objects.c
+++ b/src/libsystemd-bus/bus-objects.c
@@ -27,6 +27,7 @@
 #include "bus-signature.h"
 #include "bus-introspect.h"
 #include "bus-objects.h"
+#include "bus-util.h"
 
 static int node_vtable_get_userdata(
                 sd_bus *bus,
@@ -77,6 +78,8 @@ static int vtable_property_get_userdata(
         r = node_vtable_get_userdata(bus, path, p->parent, &u);
         if (r <= 0)
                 return r;
+        if (bus->nodes_modified)
+                return 0;
 
         *userdata = vtable_property_convert_userdata(p->vtable, u);
         return 1;
@@ -98,6 +101,9 @@ static int add_enumerated_to_set(
         LIST_FOREACH(enumerators, c, first) {
                 char **children = NULL, **k;
 
+                if (bus->nodes_modified)
+                        return 0;
+
                 r = c->callback(bus, prefix, &children, c->userdata);
                 if (r < 0)
                         return r;
@@ -142,6 +148,8 @@ static int add_subtree_to_set(
         r = add_enumerated_to_set(bus, prefix, n->enumerators, s);
         if (r < 0)
                 return r;
+        if (bus->nodes_modified)
+                return 0;
 
         LIST_FOREACH(siblings, i, n->child) {
                 char *t;
@@ -157,6 +165,8 @@ static int add_subtree_to_set(
                 r = add_subtree_to_set(bus, prefix, i, s);
                 if (r < 0)
                         return r;
+                if (bus->nodes_modified)
+                        return 0;
         }
 
         return 0;
@@ -205,6 +215,9 @@ static int node_callbacks_run(
         assert(found_object);
 
         LIST_FOREACH(callbacks, c, first) {
+                if (bus->nodes_modified)
+                        return 0;
+
                 if (require_fallback && !c->is_fallback)
                         continue;
 
@@ -213,6 +226,8 @@ static int node_callbacks_run(
                 if (c->last_iteration == bus->iteration_counter)
                         continue;
 
+                c->last_iteration = bus->iteration_counter;
+
                 r = sd_bus_message_rewind(m, true);
                 if (r < 0)
                         return r;
@@ -247,20 +262,27 @@ static int method_callbacks_run(
         r = node_vtable_get_userdata(bus, m->path, c->parent, &u);
         if (r <= 0)
                 return r;
+        if (bus->nodes_modified)
+                return 0;
 
         *found_object = true;
 
+        if (c->last_iteration == bus->iteration_counter)
+                return 0;
+
+        c->last_iteration = bus->iteration_counter;
+
         r = sd_bus_message_rewind(m, true);
         if (r < 0)
                 return r;
 
-        r = sd_bus_message_get_signature(m, true, &signature);
-        if (r < 0)
-                return r;
+        signature = sd_bus_message_get_signature(m, true);
+        if (!signature)
+                return -EINVAL;
 
         if (!streq(strempty(c->vtable->x.method.signature), signature)) {
                 r = sd_bus_reply_method_errorf(bus, m,
-                                               "org.freedesktop.DBus.Error.InvalidArgs",
+                                               SD_BUS_ERROR_INVALID_ARGS,
                                                "Invalid arguments '%s' to call %s:%s, expecting '%s'.",
                                                signature, c->interface, c->member, strempty(c->vtable->x.method.signature));
                 if (r < 0)
@@ -291,7 +313,7 @@ static int invoke_property_get(
                 void *userdata) {
 
         int r;
-        void *p;
+        const void *p;
 
         assert(bus);
         assert(v);
@@ -311,9 +333,13 @@ static int invoke_property_get(
         switch (v->x.property.signature[0]) {
 
         case SD_BUS_TYPE_STRING:
-        case SD_BUS_TYPE_OBJECT_PATH:
         case SD_BUS_TYPE_SIGNATURE:
+                p = strempty(*(char**) userdata);
+                break;
+
+        case SD_BUS_TYPE_OBJECT_PATH:
                 p = *(char**) userdata;
+                assert(p);
                 break;
 
         default:
@@ -412,6 +438,8 @@ static int property_get_set_callbacks_run(
         r = vtable_property_get_userdata(bus, m->path, c, &u);
         if (r <= 0)
                 return r;
+        if (bus->nodes_modified)
+                return 0;
 
         *found_object = true;
 
@@ -419,9 +447,14 @@ static int property_get_set_callbacks_run(
         if (r < 0)
                 return r;
 
-        c->last_iteration = bus->iteration_counter;
-
         if (is_get) {
+                /* Note that we do not protect against reexecution
+                 * here (using the last_iteration check, see below),
+                 * should the node tree have changed and we got called
+                 * again. We assume that property Get() calls are
+                 * ultimately without side-effects or if they aren't
+                 * then at least idempotent. */
+
                 r = sd_bus_message_open_container(reply, 'v', c->vtable->x.property.signature);
                 if (r < 0)
                         return r;
@@ -438,14 +471,26 @@ static int property_get_set_callbacks_run(
                         return 1;
                 }
 
+                if (bus->nodes_modified)
+                        return 0;
+
                 r = sd_bus_message_close_container(reply);
                 if (r < 0)
                         return r;
 
         } 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);
+                        sd_bus_error_setf(&error, SD_BUS_ERROR_PROPERTY_READ_ONLY, "Property '%s' is not writable.", c->member);
                 else  {
+                        /* Avoid that we call the set routine more
+                         * than once if the processing of this message
+                         * got restarted because the node tree
+                         * changed. */
+                        if (c->last_iteration == bus->iteration_counter)
+                                return 0;
+
+                        c->last_iteration = bus->iteration_counter;
+
                         r = sd_bus_message_enter_container(m, 'v', c->vtable->x.property.signature);
                         if (r < 0)
                                 return r;
@@ -463,6 +508,9 @@ static int property_get_set_callbacks_run(
                         return 1;
                 }
 
+                if (bus->nodes_modified)
+                        return 0;
+
                 r = sd_bus_message_exit_container(m);
                 if (r < 0)
                         return r;
@@ -510,9 +558,10 @@ static int vtable_append_all_properties(
                 r = invoke_property_get(bus, v, path, c->interface, v->x.property.member, reply, error, vtable_property_convert_userdata(v, userdata));
                 if (r < 0)
                         return r;
-
                 if (sd_bus_error_is_set(error))
                         return 0;
+                if (bus->nodes_modified)
+                        return 0;
 
                 r = sd_bus_message_close_container(reply);
                 if (r < 0)
@@ -561,6 +610,8 @@ static int property_get_all_callbacks_run(
                 r = node_vtable_get_userdata(bus, m->path, c, &u);
                 if (r < 0)
                         return r;
+                if (bus->nodes_modified)
+                        return 0;
                 if (r == 0)
                         continue;
 
@@ -570,8 +621,6 @@ static int property_get_all_callbacks_run(
                         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;
@@ -583,12 +632,14 @@ static int property_get_all_callbacks_run(
 
                         return 1;
                 }
+                if (bus->nodes_modified)
+                        return 0;
         }
 
         if (!found_interface) {
                 r = sd_bus_reply_method_errorf(
                                 bus, m,
-                                "org.freedesktop.DBus.Error.UnknownInterface",
+                                SD_BUS_ERROR_UNKNOWN_INTERFACE,
                                 "Unknown interface '%s'.", iface);
                 if (r < 0)
                         return r;
@@ -650,6 +701,8 @@ static bool bus_node_exists(
 
                 if (node_vtable_get_userdata(bus, path, c, NULL) > 0)
                         return true;
+                if (bus->nodes_modified)
+                        return false;
         }
 
         return !require_fallback && (n->enumerators || n->object_manager);
@@ -677,6 +730,8 @@ static int process_introspect(
         r = get_child_nodes(bus, m->path, n, &s);
         if (r < 0)
                 return r;
+        if (bus->nodes_modified)
+                return 0;
 
         r = introspect_begin(&intro);
         if (r < 0)
@@ -695,6 +750,8 @@ static int process_introspect(
                 r = node_vtable_get_userdata(bus, m->path, c, NULL);
                 if (r < 0)
                         return r;
+                if (bus->nodes_modified)
+                        return 0;
                 if (r == 0)
                         continue;
 
@@ -711,7 +768,8 @@ static int process_introspect(
                 r = bus_node_exists(bus, n, m->path, require_fallback);
                 if (r < 0)
                         return r;
-
+                if (bus->nodes_modified)
+                        return 0;
                 if (r == 0)
                         goto finish;
         }
@@ -742,9 +800,9 @@ static int object_manager_serialize_vtable(
                 sd_bus_message *reply,
                 const char *path,
                 struct node_vtable *c,
-                sd_bus_error *error) {
+                sd_bus_error *error,
+                void *userdata) {
 
-        void *u;
         int r;
 
         assert(bus);
@@ -753,10 +811,6 @@ static int object_manager_serialize_vtable(
         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;
@@ -769,9 +823,11 @@ static int object_manager_serialize_vtable(
         if (r < 0)
                 return r;
 
-        r = vtable_append_all_properties(bus, reply, path, c, u, error);
+        r = vtable_append_all_properties(bus, reply, path, c, userdata, error);
         if (r < 0)
                 return r;
+        if (bus->nodes_modified)
+                return 0;
 
         r = sd_bus_message_close_container(reply);
         if (r < 0)
@@ -794,6 +850,7 @@ static int object_manager_serialize_path(
 
         struct node_vtable *i;
         struct node *n;
+        bool found_something = false;
         int r;
 
         assert(bus);
@@ -806,37 +863,54 @@ static int object_manager_serialize_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) {
+                void *u;
 
                 if (require_fallback && !i->is_fallback)
                         continue;
 
-                r = object_manager_serialize_vtable(bus, reply, path, i, error);
+                r = node_vtable_get_userdata(bus, path, i, &u);
+                if (r < 0)
+                        return r;
+                if (bus->nodes_modified)
+                        return 0;
+                if (r == 0)
+                        continue;
+
+                if (!found_something) {
+                        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;
+
+                        found_something = true;
+                }
+
+                r = object_manager_serialize_vtable(bus, reply, path, i, error, u);
                 if (r < 0)
                         return r;
                 if (sd_bus_error_is_set(error))
                         return 0;
+                if (bus->nodes_modified)
+                        return 0;
         }
 
-        r = sd_bus_message_close_container(reply);
-        if (r < 0)
-                return r;
+        if (found_something) {
+                r = sd_bus_message_close_container(reply);
+                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 1;
 }
@@ -847,7 +921,7 @@ static int object_manager_serialize_path_and_fallbacks(
                 const char *path,
                 sd_bus_error *error) {
 
-        size_t pl;
+        char *prefix;
         int r;
 
         assert(bus);
@@ -861,29 +935,19 @@ static int object_manager_serialize_path_and_fallbacks(
                 return r;
         if (sd_bus_error_is_set(error))
                 return 0;
+        if (bus->nodes_modified)
+                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, path, true, error);
-                        if (r < 0)
-                                return r;
-
-                        if (sd_bus_error_is_set(error))
-                                return 0;
-                }
+        prefix = alloca(strlen(path) + 1);
+        OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+                r = object_manager_serialize_path(bus, reply, prefix, path, true, error);
+                if (r < 0)
+                        return r;
+                if (sd_bus_error_is_set(error))
+                        return 0;
+                if (bus->nodes_modified)
+                        return 0;
         }
 
         return 0;
@@ -912,6 +976,8 @@ static int process_get_managed_objects(
         r = get_child_nodes(bus, m->path, n, &s);
         if (r < 0)
                 return r;
+        if (bus->nodes_modified)
+                return 0;
 
         r = sd_bus_message_new_method_return(bus, m, &reply);
         if (r < 0)
@@ -963,6 +1029,9 @@ static int process_get_managed_objects(
 
                                 return 1;
                         }
+
+                        if (bus->nodes_modified)
+                                return 0;
                 }
         }
 
@@ -1001,6 +1070,8 @@ static int object_find_and_run(
         r = node_callbacks_run(bus, m, n->callbacks, require_fallback, found_object);
         if (r != 0)
                 return r;
+        if (bus->nodes_modified)
+                return 0;
 
         if (!m->interface || !m->member)
                 return 0;
@@ -1015,6 +1086,8 @@ static int object_find_and_run(
                 r = method_callbacks_run(bus, m, v, require_fallback, found_object);
                 if (r != 0)
                         return r;
+                if (bus->nodes_modified)
+                        return 0;
         }
 
         /* Then, look for a known property */
@@ -1074,11 +1147,13 @@ static int object_find_and_run(
                         return r;
         }
 
+        if (bus->nodes_modified)
+                return 0;
+
         if (!*found_object) {
                 r = bus_node_exists(bus, n, m->path, require_fallback);
                 if (r < 0)
                         return r;
-
                 if (r > 0)
                         *found_object = true;
         }
@@ -1094,7 +1169,7 @@ int bus_process_object(sd_bus *bus, sd_bus_message *m) {
         assert(bus);
         assert(m);
 
-        if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
+        if (m->header->type != SD_BUS_MESSAGE_METHOD_CALL)
                 return 0;
 
         if (!m->path)
@@ -1105,7 +1180,7 @@ int bus_process_object(sd_bus *bus, sd_bus_message *m) {
 
         pl = strlen(m->path);
         do {
-                char p[pl+1];
+                char prefix[pl+1];
 
                 bus->nodes_modified = false;
 
@@ -1114,24 +1189,12 @@ int bus_process_object(sd_bus *bus, sd_bus_message *m) {
                         return r;
 
                 /* Look for fallback prefixes */
-                strcpy(p, m->path);
-                for (;;) {
-                        char *e;
-
-                        if (streq(p, "/"))
-                                break;
+                OBJECT_PATH_FOREACH_PREFIX(prefix, m->path) {
 
                         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);
+                        r = object_find_and_run(bus, m, prefix, true, &found_object);
                         if (r != 0)
                                 return r;
                 }
@@ -1145,12 +1208,12 @@ int bus_process_object(sd_bus *bus, sd_bus_message *m) {
             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",
+                                SD_BUS_ERROR_UNKNOWN_PROPERTY,
                                 "Unknown property or interface.");
         else
                 r = sd_bus_reply_method_errorf(
                                 bus, m,
-                                "org.freedesktop.DBus.Error.UnknownMethod",
+                                SD_BUS_ERROR_UNKNOWN_METHOD,
                                 "Unknown method '%s' or interface '%s'.", m->member, m->interface);
 
         if (r < 0)
@@ -1211,7 +1274,7 @@ static struct node *bus_node_allocate(sd_bus *bus, const char *path) {
         }
 
         if (parent)
-                LIST_PREPEND(struct node, siblings, parent->child, n);
+                LIST_PREPEND(siblings, parent->child, n);
 
         return n;
 }
@@ -1232,7 +1295,7 @@ static void bus_node_gc(sd_bus *b, struct node *n) {
         assert(hashmap_remove(b->nodes, n->path) == n);
 
         if (n->parent)
-                LIST_REMOVE(struct node, siblings, n->parent->child, n);
+                LIST_REMOVE(siblings, n->parent->child, n);
 
         free(n->path);
         bus_node_gc(b, n->parent);
@@ -1270,7 +1333,9 @@ static int bus_add_object(
         c->userdata = userdata;
         c->is_fallback = fallback;
 
-        LIST_PREPEND(struct node_callback, callbacks, n->callbacks, c);
+        LIST_PREPEND(callbacks, n->callbacks, c);
+        bus->nodes_modified = true;
+
         return 0;
 
 fail:
@@ -1304,10 +1369,11 @@ static int bus_remove_object(
         if (!c)
                 return 0;
 
-        LIST_REMOVE(struct node_callback, callbacks, n->callbacks, c);
+        LIST_REMOVE(callbacks, n->callbacks, c);
         free(c);
 
         bus_node_gc(bus, n);
+        bus->nodes_modified = true;
 
         return 1;
 }
@@ -1561,7 +1627,9 @@ static int add_object_vtable_internal(
                 }
         }
 
-        LIST_PREPEND(struct node_vtable, vtables, n->vtables, c);
+        LIST_PREPEND(vtables, n->vtables, c);
+        bus->nodes_modified = true;
+
         return 0;
 
 fail:
@@ -1597,11 +1665,13 @@ static int remove_object_vtable_internal(
         if (!c)
                 return 0;
 
-        LIST_REMOVE(struct node_vtable, vtables, n->vtables, c);
+        LIST_REMOVE(vtables, n->vtables, c);
 
         free_node_vtable(bus, c);
         bus_node_gc(bus, n);
 
+        bus->nodes_modified = true;
+
         return 1;
 }
 
@@ -1671,7 +1741,10 @@ int sd_bus_add_node_enumerator(
         c->callback = callback;
         c->userdata = userdata;
 
-        LIST_PREPEND(struct node_enumerator, enumerators, n->enumerators, c);
+        LIST_PREPEND(enumerators, n->enumerators, c);
+
+        bus->nodes_modified = true;
+
         return 0;
 
 fail:
@@ -1705,11 +1778,13 @@ int sd_bus_remove_node_enumerator(
         if (!c)
                 return 0;
 
-        LIST_REMOVE(struct node_enumerator, enumerators, n->enumerators, c);
+        LIST_REMOVE(enumerators, n->enumerators, c);
         free(c);
 
         bus_node_gc(bus, n);
 
+        bus->nodes_modified = true;
+
         return 1;
 }
 
@@ -1753,6 +1828,8 @@ static int emit_properties_changed_on_interface(
         r = node_vtable_get_userdata(bus, path, c, &u);
         if (r <= 0)
                 return r;
+        if (bus->nodes_modified)
+                return 0;
 
         r = sd_bus_message_new_signal(bus, path, "org.freedesktop.DBus.Properties", "PropertiesChanged", &m);
         if (r < 0)
@@ -1803,9 +1880,8 @@ static int emit_properties_changed_on_interface(
                 r = invoke_property_get(bus, v->vtable, m->path, interface, *property, m, &error, vtable_property_convert_userdata(v->vtable, u));
                 if (r < 0)
                         return r;
-
-                if (sd_bus_error_is_set(&error))
-                        return bus_error_to_errno(&error);
+                if (bus->nodes_modified)
+                        return 0;
 
                 r = sd_bus_message_close_container(m);
                 if (r < 0)
@@ -1858,7 +1934,8 @@ int sd_bus_emit_properties_changed_strv(
                 const char *interface,
                 char **names) {
 
-        size_t pl;
+        BUS_DONT_DESTROY(bus);
+        char *prefix;
         int r;
 
         assert_return(bus, -EINVAL);
@@ -1870,33 +1947,25 @@ int sd_bus_emit_properties_changed_strv(
         if (strv_isempty(names))
                 return 0;
 
-        r = emit_properties_changed_on_interface(bus, path, path, interface, false, names);
-        if (r != 0)
-                return r;
-
-        pl = strlen(path);
-        if (pl > 1 ) {
-                char p[pl+1];
-
-                strcpy(p, path);
-                for (;;) {
-                        char *e;
-
-                        if (streq(p, "/"))
-                                break;
+        do {
+                bus->nodes_modified = false;
 
-                        e = strrchr(p, '/');
-                        assert(e);
-                        if (e == p)
-                                *(e+1) = 0;
-                        else
-                                *e = 0;
+                r = emit_properties_changed_on_interface(bus, path, path, interface, false, names);
+                if (r != 0)
+                        return r;
+                if (bus->nodes_modified)
+                        continue;
 
-                        r = emit_properties_changed_on_interface(bus, p, path, interface, true, names);
+                prefix = alloca(strlen(path) + 1);
+                OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+                        r = emit_properties_changed_on_interface(bus, prefix, path, interface, true, names);
                         if (r != 0)
                                 return r;
+                        if (bus->nodes_modified)
+                                break;
                 }
-        }
+
+        } while (bus->nodes_modified);
 
         return -ENOENT;
 }
@@ -1907,8 +1976,7 @@ int sd_bus_emit_properties_changed(
                 const char *interface,
                 const char *name, ...)  {
 
-        _cleanup_strv_free_ char **names = NULL;
-        va_list ap;
+        char **names;
 
         assert_return(bus, -EINVAL);
         assert_return(object_path_is_valid(path), -EINVAL);
@@ -1919,22 +1987,220 @@ int sd_bus_emit_properties_changed(
         if (!name)
                 return 0;
 
-        va_start(ap, name);
-        names = strv_new_ap(name, ap);
-        va_end(ap);
-
-        if (!names)
-                return -ENOMEM;
+        names = strv_from_stdarg_alloca(name);
 
         return sd_bus_emit_properties_changed_strv(bus, path, interface, names);
 }
 
-int sd_bus_emit_interfaces_added(sd_bus *bus, const char *path, const char *interfaces, ...) {
-        return -ENOSYS;
+static int interfaces_added_append_one_prefix(
+                sd_bus *bus,
+                sd_bus_message *m,
+                const char *prefix,
+                const char *path,
+                const char *interface,
+                bool require_fallback) {
+
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        struct node_vtable *c;
+        struct node *n;
+        void *u = NULL;
+        int r;
+
+        assert(bus);
+        assert(m);
+        assert(prefix);
+        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;
+        }
+
+        if (!c)
+                return 0;
+
+        r = node_vtable_get_userdata(bus, path, c, &u);
+        if (r <= 0)
+                return r;
+        if (bus->nodes_modified)
+                return 0;
+
+        r = sd_bus_message_append_basic(m, 's', interface);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_open_container(m, 'a', "{sv}");
+        if (r < 0)
+                return r;
+
+        r = vtable_append_all_properties(bus, m,path, c, u, &error);
+        if (r < 0)
+                return r;
+        if (bus->nodes_modified)
+                return 0;
+
+        r = sd_bus_message_close_container(m);
+        if (r < 0)
+                return r;
+
+        return 1;
+}
+
+static int interfaces_added_append_one(
+                sd_bus *bus,
+                sd_bus_message *m,
+                const char *path,
+                const char *interface) {
+
+        char *prefix;
+        int r;
+
+        assert(bus);
+        assert(m);
+        assert(path);
+        assert(interface);
+
+        r = interfaces_added_append_one_prefix(bus, m, path, path, interface, false);
+        if (r != 0)
+                return r;
+        if (bus->nodes_modified)
+                return 0;
+
+        prefix = alloca(strlen(path) + 1);
+        OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+                r = interfaces_added_append_one_prefix(bus, m, prefix, path, interface, true);
+                if (r != 0)
+                        return r;
+                if (bus->nodes_modified)
+                        return 0;
+        }
+
+        return -ENOENT;
+}
+
+int sd_bus_emit_interfaces_added_strv(sd_bus *bus, const char *path, char **interfaces) {
+        BUS_DONT_DESTROY(bus);
+
+        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        char **i;
+        int r;
+
+        assert_return(bus, -EINVAL);
+        assert_return(object_path_is_valid(path), -EINVAL);
+        assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        if (strv_isempty(interfaces))
+                return 0;
+
+        do {
+                bus->nodes_modified = false;
+
+                if (m)
+                        m = sd_bus_message_unref(m);
+
+                r = sd_bus_message_new_signal(bus, path, "org.freedesktop.DBus.ObjectManager", "InterfacesAdded", &m);
+                if (r < 0)
+                        return r;
+
+                r = sd_bus_message_append_basic(m, 'o', path);
+                if (r < 0)
+                        return r;
+
+                r = sd_bus_message_open_container(m, 'a', "{sa{sv}}");
+                if (r < 0)
+                        return r;
+
+                STRV_FOREACH(i, interfaces) {
+                        assert_return(interface_name_is_valid(*i), -EINVAL);
+
+                        r = sd_bus_message_open_container(m, 'e', "sa{sv}");
+                        if (r < 0)
+                                return r;
+
+                        r = interfaces_added_append_one(bus, m, path, *i);
+                        if (r < 0)
+                                return r;
+
+                        if (bus->nodes_modified)
+                                break;
+
+                        r = sd_bus_message_close_container(m);
+                        if (r < 0)
+                                return r;
+                }
+
+                if (bus->nodes_modified)
+                        continue;
+
+                r = sd_bus_message_close_container(m);
+                if (r < 0)
+                        return r;
+
+        } while (bus->nodes_modified);
+
+        return sd_bus_send(bus, m, NULL);
+}
+
+int sd_bus_emit_interfaces_added(sd_bus *bus, const char *path, const char *interface, ...) {
+        char **interfaces;
+
+        assert_return(bus, -EINVAL);
+        assert_return(object_path_is_valid(path), -EINVAL);
+        assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        interfaces = strv_from_stdarg_alloca(interface);
+
+        return sd_bus_emit_interfaces_added_strv(bus, path, interfaces);
 }
 
-int sd_bus_emit_interfaces_removed(sd_bus *bus, const char *path, const char *interfaces, ...) {
-        return -ENOSYS;
+int sd_bus_emit_interfaces_removed_strv(sd_bus *bus, const char *path, char **interfaces) {
+        _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        int r;
+
+        assert_return(bus, -EINVAL);
+        assert_return(object_path_is_valid(path), -EINVAL);
+        assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        if (strv_isempty(interfaces))
+                return 0;
+
+        r = sd_bus_message_new_signal(bus, path, "org.freedesktop.DBus.ObjectManager", "InterfacesRemoved", &m);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_append_basic(m, 'o', path);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_append_strv(m, interfaces);
+        if (r < 0)
+                return r;
+
+        return sd_bus_send(bus, m, NULL);
+}
+
+int sd_bus_emit_interfaces_removed(sd_bus *bus, const char *path, const char *interface, ...) {
+        char **interfaces;
+
+        assert_return(bus, -EINVAL);
+        assert_return(object_path_is_valid(path), -EINVAL);
+        assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+        assert_return(!bus_pid_changed(bus), -ECHILD);
+
+        interfaces = strv_from_stdarg_alloca(interface);
+
+        return sd_bus_emit_interfaces_removed_strv(bus, path, interfaces);
 }
 
 int sd_bus_add_object_manager(sd_bus *bus, const char *path) {
@@ -1949,6 +2215,7 @@ int sd_bus_add_object_manager(sd_bus *bus, const char *path) {
                 return -ENOMEM;
 
         n->object_manager = true;
+        bus->nodes_modified = true;
         return 0;
 }
 
@@ -1967,6 +2234,7 @@ int sd_bus_remove_object_manager(sd_bus *bus, const char *path) {
                 return 0;
 
         n->object_manager = false;
+        bus->nodes_modified = true;
         bus_node_gc(bus, n);
 
         return 1;