X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-objects.c;h=a6e8b2de867a38d5ea1e4a67026585a08bd83676;hb=718db96199e;hp=c306c54df67795290069c7aea9c3a47992dc416c;hpb=8e4e652b92c8c2f640f8ac1c839dd4a0fd11f3c4;p=elogind.git diff --git a/src/libsystemd-bus/bus-objects.c b/src/libsystemd-bus/bus-objects.c index c306c54df..a6e8b2de8 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; @@ -108,12 +114,17 @@ static int add_enumerated_to_set( continue; } - if (!object_path_is_valid(*k) && object_path_startswith(*k, prefix)) { + if (!object_path_is_valid(*k)){ free(*k); r = -EINVAL; continue; } + if (!object_path_startswith(*k, prefix)) { + free(*k); + continue; + } + r = set_consume(s, *k); } @@ -142,10 +153,15 @@ 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; + if (!object_path_startswith(i->path, prefix)) + continue; + t = strdup(i->path); if (!t) return -ENOMEM; @@ -157,6 +173,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 +223,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 +234,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 +270,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) @@ -290,8 +320,7 @@ static int invoke_property_get( sd_bus_error *error, void *userdata) { - int r; - void *p; + const void *p; assert(bus); assert(v); @@ -305,15 +334,22 @@ static int invoke_property_get( /* Automatic handling if no callback is defined. */ + if (streq(v->x.property.signature, "as")) + return sd_bus_message_append_strv(m, *(char***) userdata); + assert(signature_is_single(v->x.property.signature, false)); assert(bus_type_is_basic(v->x.property.signature[0])); 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: @@ -321,11 +357,7 @@ static int invoke_property_get( break; } - r = sd_bus_message_append_basic(m, v->x.property.signature[0], p); - if (r < 0) - return r; - - return 1; + return sd_bus_message_append_basic(m, v->x.property.signature[0], p); } static int invoke_property_set( @@ -412,6 +444,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 +453,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 +477,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 +514,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 +564,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) @@ -536,7 +591,7 @@ static int property_get_all_callbacks_run( _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; struct node_vtable *c; - bool found_interface = false; + bool found_interface; int r; assert(bus); @@ -551,6 +606,11 @@ static int property_get_all_callbacks_run( if (r < 0) return r; + found_interface = !iface || + streq(iface, "org.freedesktop.DBus.Properties") || + streq(iface, "org.freedesktop.DBus.Peer") || + streq(iface, "org.freedesktop.DBus.Introspectable"); + LIST_FOREACH(vtables, c, first) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; void *u; @@ -561,6 +621,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 +632,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 +643,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 +712,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); @@ -664,6 +728,7 @@ static int process_introspect( _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_set_free_free_ Set *s = NULL; + const char *previous_interface = NULL; struct introspect intro; struct node_vtable *c; bool empty; @@ -677,6 +742,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,23 +762,39 @@ 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; empty = false; - r = introspect_write_interface(&intro, c->interface, c->vtable); + if (!streq_ptr(previous_interface, c->interface)) { + + if (previous_interface) + fputs(" \n", intro.f); + + fprintf(intro.f, " \n", c->interface); + } + + r = introspect_write_interface(&intro, c->vtable); if (r < 0) goto finish; + + previous_interface = c->interface; } + if (previous_interface) + fputs(" \n", intro.f); + 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 (bus->nodes_modified) + return 0; if (r == 0) goto finish; } @@ -737,106 +820,122 @@ finish: return r; } -static int object_manager_serialize_vtable( +static int object_manager_serialize_path( sd_bus *bus, sd_bus_message *reply, + const char *prefix, const char *path, - struct node_vtable *c, + bool require_fallback, sd_bus_error *error) { - void *u; + const char *previous_interface = NULL; + bool found_something = false; + struct node_vtable *i; + struct node *n; int r; assert(bus); assert(reply); + assert(prefix); assert(path); - assert(c); assert(error); - r = node_vtable_get_userdata(bus, path, c, &u); - if (r <= 0) - return r; + n = hashmap_get(bus->nodes, prefix); + if (!n) + return 0; - r = sd_bus_message_open_container(reply, 'e', "sa{sv}"); - if (r < 0) - return r; + LIST_FOREACH(vtables, i, n->vtables) { + void *u; - r = sd_bus_message_append(reply, "s", c->interface); - if (r < 0) - return r; + if (require_fallback && !i->is_fallback) + continue; - r = sd_bus_message_open_container(reply, 'a', "{sv}"); - if (r < 0) - return r; + r = node_vtable_get_userdata(bus, path, i, &u); + if (r < 0) + return r; + if (bus->nodes_modified) + return 0; + if (r == 0) + continue; - r = vtable_append_all_properties(bus, reply, path, c, u, error); - if (r < 0) - return r; + if (!found_something) { - r = sd_bus_message_close_container(reply); - if (r < 0) - return r; + /* Open the object part */ - r = sd_bus_message_close_container(reply); - if (r < 0) - return r; + r = sd_bus_message_open_container(reply, 'e', "oa{sa{sv}}"); + if (r < 0) + return r; - return 0; -} + r = sd_bus_message_append(reply, "o", path); + if (r < 0) + return r; -static int object_manager_serialize_path( - sd_bus *bus, - sd_bus_message *reply, - const char *prefix, - const char *path, - bool require_fallback, - sd_bus_error *error) { + r = sd_bus_message_open_container(reply, 'a', "{sa{sv}}"); + if (r < 0) + return r; - struct node_vtable *i; - struct node *n; - int r; + found_something = true; + } - assert(bus); - assert(reply); - assert(prefix); - assert(path); - assert(error); + if (!streq_ptr(previous_interface, i->interface)) { - n = hashmap_get(bus->nodes, prefix); - if (!n) - return 0; + /* Maybe close the previous interface part */ - r = sd_bus_message_open_container(reply, 'e', "oa{sa{sv}}"); - if (r < 0) - return r; + if (previous_interface) { + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; - r = sd_bus_message_append(reply, "o", path); - if (r < 0) - return r; + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; + } - r = sd_bus_message_open_container(reply, 'a', "{sa{sv}}"); - if (r < 0) - return r; + /* Open the new interface part */ - LIST_FOREACH(vtables, i, n->vtables) { + r = sd_bus_message_open_container(reply, 'e', "sa{sv}"); + if (r < 0) + return r; - if (require_fallback && !i->is_fallback) - continue; + r = sd_bus_message_append(reply, "s", i->interface); + if (r < 0) + return r; + + r = sd_bus_message_open_container(reply, 'a', "{sv}"); + if (r < 0) + return r; + } - r = object_manager_serialize_vtable(bus, reply, path, i, error); + r = vtable_append_all_properties(bus, reply, path, i, u, error); if (r < 0) return r; if (sd_bus_error_is_set(error)) return 0; + if (bus->nodes_modified) + return 0; + + previous_interface = i->interface; } - r = sd_bus_message_close_container(reply); - if (r < 0) - return r; + if (previous_interface) { + 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; + } + + 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; + } return 1; } @@ -847,7 +946,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 +960,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 +1001,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 +1054,9 @@ static int process_get_managed_objects( return 1; } + + if (bus->nodes_modified) + return 0; } } @@ -1001,6 +1095,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 +1111,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 +1172,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 +1194,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 +1205,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 +1214,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 +1233,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 +1299,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 +1320,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 +1358,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,27 +1394,44 @@ 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; } -int sd_bus_add_object(sd_bus *bus, const char *path, sd_bus_message_handler_t callback, void *userdata) { +_public_ 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) { +_public_ 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) { +_public_ 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) { +_public_ 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); } @@ -1410,7 +1517,7 @@ static int add_object_vtable_internal( sd_bus_object_find_t find, void *userdata) { - struct node_vtable *c = NULL, *i; + struct node_vtable *c = NULL, *i, *existing = NULL; const sd_bus_vtable *v; struct node *n; int r; @@ -1422,6 +1529,10 @@ static int add_object_vtable_internal( assert_return(vtable[0].type == _SD_BUS_VTABLE_START, -EINVAL); assert_return(vtable[0].x.start.element_size == sizeof(struct sd_bus_vtable), -EINVAL); assert_return(!bus_pid_changed(bus), -ECHILD); + assert_return(!streq(interface, "org.freedesktop.DBus.Properties") && + !streq(interface, "org.freedesktop.DBus.Introspectable") && + !streq(interface, "org.freedesktop.DBus.Peer") && + !streq(interface, "org.freedesktop.DBus.ObjectManager"), -EINVAL); r = hashmap_ensure_allocated(&bus->vtable_methods, vtable_member_hash_func, vtable_member_compare_func); if (r < 0) @@ -1436,15 +1547,20 @@ static int add_object_vtable_internal( 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; } + + if (streq(i->interface, interface)) { + + if (i->vtable == vtable) { + r = -EEXIST; + goto fail; + } + + existing = i; + } } c = new0(struct node_vtable, 1); @@ -1516,7 +1632,7 @@ static int add_object_vtable_internal( if (!member_name_is_valid(v->x.property.member) || !signature_is_single(v->x.property.signature, false) || - !(v->x.property.get || bus_type_is_basic(v->x.property.signature[0])) || + !(v->x.property.get || bus_type_is_basic(v->x.property.signature[0]) || streq(v->x.property.signature, "as")) || 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; @@ -1548,7 +1664,7 @@ static int add_object_vtable_internal( case _SD_BUS_VTABLE_SIGNAL: if (!member_name_is_valid(v->x.signal.member) || - !signature_is_single(strempty(v->x.signal.signature), false)) { + !signature_is_valid(strempty(v->x.signal.signature), false)) { r = -EINVAL; goto fail; } @@ -1561,7 +1677,9 @@ static int add_object_vtable_internal( } } - LIST_PREPEND(struct node_vtable, vtables, n->vtables, c); + LIST_INSERT_AFTER(vtables, n->vtables, existing, c); + bus->nodes_modified = true; + return 0; fail: @@ -1576,7 +1694,10 @@ static int remove_object_vtable_internal( sd_bus *bus, const char *path, const char *interface, - bool fallback) { + const sd_bus_vtable *vtable, + bool fallback, + sd_bus_object_find_t find, + void *userdata) { struct node_vtable *c; struct node *n; @@ -1591,21 +1712,27 @@ static int remove_object_vtable_internal( return 0; LIST_FOREACH(vtables, c, n->vtables) - if (streq(c->interface, interface) && c->is_fallback == fallback) + if (streq(c->interface, interface) && + c->is_fallback == fallback && + c->vtable == vtable && + c->find == find && + c->userdata == userdata) break; 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; } -int sd_bus_add_object_vtable( +_public_ int sd_bus_add_object_vtable( sd_bus *bus, const char *path, const char *interface, @@ -1615,15 +1742,17 @@ int sd_bus_add_object_vtable( return add_object_vtable_internal(bus, path, interface, vtable, false, NULL, userdata); } -int sd_bus_remove_object_vtable( +_public_ int sd_bus_remove_object_vtable( sd_bus *bus, const char *path, - const char *interface) { + const char *interface, + const sd_bus_vtable *vtable, + void *userdata) { - return remove_object_vtable_internal(bus, path, interface, false); + return remove_object_vtable_internal(bus, path, interface, vtable, false, NULL, userdata); } -int sd_bus_add_fallback_vtable( +_public_ int sd_bus_add_fallback_vtable( sd_bus *bus, const char *path, const char *interface, @@ -1634,15 +1763,18 @@ int sd_bus_add_fallback_vtable( return add_object_vtable_internal(bus, path, interface, vtable, true, find, userdata); } -int sd_bus_remove_fallback_vtable( +_public_ int sd_bus_remove_fallback_vtable( sd_bus *bus, const char *path, - const char *interface) { + const char *interface, + const sd_bus_vtable *vtable, + sd_bus_object_find_t find, + void *userdata) { - return remove_object_vtable_internal(bus, path, interface, true); + return remove_object_vtable_internal(bus, path, interface, vtable, true, find, userdata); } -int sd_bus_add_node_enumerator( +_public_ int sd_bus_add_node_enumerator( sd_bus *bus, const char *path, sd_bus_node_enumerator_t callback, @@ -1671,7 +1803,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: @@ -1680,7 +1815,7 @@ fail: return r; } -int sd_bus_remove_node_enumerator( +_public_ int sd_bus_remove_node_enumerator( sd_bus *bus, const char *path, sd_bus_node_enumerator_t callback, @@ -1705,11 +1840,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; } @@ -1722,8 +1859,8 @@ static int emit_properties_changed_on_interface( char **names) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL; - bool has_invalidating = false; - struct vtable_member key; + bool has_invalidating = false, has_changing = false; + struct vtable_member key = {}; struct node_vtable *c; struct node *n; char **property; @@ -1739,21 +1876,6 @@ static int emit_properties_changed_on_interface( 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; - r = sd_bus_message_new_signal(bus, path, "org.freedesktop.DBus.Properties", "PropertiesChanged", &m); if (r < 0) return r; @@ -1769,53 +1891,78 @@ static int emit_properties_changed_on_interface( key.path = prefix; key.interface = interface; - STRV_FOREACH(property, names) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - struct vtable_member *v; - - assert_return(member_name_is_valid(*property), -EINVAL); - - key.member = *property; - v = hashmap_get(bus->vtable_properties, &key); - if (!v) - return -ENOENT; - - assert(c == v->parent); - assert_return(v->vtable->flags & SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE, -EDOM); + LIST_FOREACH(vtables, c, n->vtables) { + if (require_fallback && !c->is_fallback) + continue; - if (v->vtable->flags & SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY) { - has_invalidating = true; + if (!streq(c->interface, interface)) continue; - } - r = sd_bus_message_open_container(m, 'e', "sv"); + r = node_vtable_get_userdata(bus, path, c, &u); if (r < 0) return r; + if (bus->nodes_modified) + return 0; + if (r == 0) + continue; - r = sd_bus_message_append(m, "s", *property); - if (r < 0) - return r; + STRV_FOREACH(property, names) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + struct vtable_member *v; - r = sd_bus_message_open_container(m, 'v', v->vtable->x.property.signature); - if (r < 0) - return r; + assert_return(member_name_is_valid(*property), -EINVAL); - 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; + key.member = *property; + v = hashmap_get(bus->vtable_properties, &key); + if (!v) + return -ENOENT; + + /* If there are two vtables for the same + * interface, let's handle this property when + * we come to that vtable. */ + if (c != v->parent) + continue; - if (sd_bus_error_is_set(&error)) - return bus_error_to_errno(&error); + assert_return(v->vtable->flags & SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE, -EDOM); - r = sd_bus_message_close_container(m); - if (r < 0) - return r; + if (v->vtable->flags & SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY) { + has_invalidating = true; + continue; + } - r = sd_bus_message_close_container(m); - if (r < 0) - return r; + has_changing = true; + + r = sd_bus_message_open_container(m, 'e', "sv"); + if (r < 0) + return r; + + r = sd_bus_message_append(m, "s", *property); + if (r < 0) + return r; + + r = sd_bus_message_open_container(m, 'v', v->vtable->x.property.signature); + if (r < 0) + return r; + + 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 (bus->nodes_modified) + return 0; + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + } } + if (!has_invalidating && !has_changing) + return 0; + r = sd_bus_message_close_container(m); if (r < 0) return r; @@ -1825,19 +1972,35 @@ static int emit_properties_changed_on_interface( return r; if (has_invalidating) { - STRV_FOREACH(property, names) { - struct vtable_member *v; - - key.member = *property; - assert_se(v = hashmap_get(bus->vtable_properties, &key)); - assert(c == v->parent); + LIST_FOREACH(vtables, c, n->vtables) { + if (require_fallback && !c->is_fallback) + continue; - if (!(v->vtable->flags & SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY)) + if (!streq(c->interface, interface)) continue; - r = sd_bus_message_append(m, "s", *property); + r = node_vtable_get_userdata(bus, path, c, &u); if (r < 0) return r; + if (bus->nodes_modified) + return 0; + if (r == 0) + continue; + + STRV_FOREACH(property, names) { + struct vtable_member *v; + + key.member = *property; + assert_se(v = hashmap_get(bus->vtable_properties, &key)); + assert(c == v->parent); + + if (!(v->vtable->flags & SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY)) + continue; + + r = sd_bus_message_append(m, "s", *property); + if (r < 0) + return r; + } } } @@ -1852,13 +2015,14 @@ static int emit_properties_changed_on_interface( return 1; } -int sd_bus_emit_properties_changed_strv( +_public_ int sd_bus_emit_properties_changed_strv( sd_bus *bus, const char *path, const char *interface, char **names) { - size_t pl; + BUS_DONT_DESTROY(bus); + char *prefix; int r; assert_return(bus, -EINVAL); @@ -1870,45 +2034,36 @@ 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; } -int sd_bus_emit_properties_changed( +_public_ 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; + char **names; assert_return(bus, -EINVAL); assert_return(object_path_is_valid(path), -EINVAL); @@ -1919,25 +2074,229 @@ 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; + bool found_interface = false; + 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)) + continue; + + r = node_vtable_get_userdata(bus, path, c, &u); + if (r < 0) + return r; + if (bus->nodes_modified) + return 0; + if (r == 0) + continue; + + if (!found_interface) { + 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; + + found_interface = true; + } + + r = vtable_append_all_properties(bus, m, path, c, u, &error); + if (r < 0) + return r; + if (bus->nodes_modified) + return 0; + } + + if (found_interface) { + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + } + + return found_interface; } -int sd_bus_emit_interfaces_removed(sd_bus *bus, const char *path, const char *interfaces, ...) { - return -ENOSYS; +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; +} + +_public_ 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); +} + +_public_ 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); +} + +_public_ 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); +} + +_public_ 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) { +_public_ int sd_bus_add_object_manager(sd_bus *bus, const char *path) { struct node *n; assert_return(bus, -EINVAL); @@ -1949,10 +2308,11 @@ int sd_bus_add_object_manager(sd_bus *bus, const char *path) { return -ENOMEM; n->object_manager = true; + bus->nodes_modified = true; return 0; } -int sd_bus_remove_object_manager(sd_bus *bus, const char *path) { +_public_ int sd_bus_remove_object_manager(sd_bus *bus, const char *path) { struct node *n; assert_return(bus, -EINVAL); @@ -1967,6 +2327,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;