X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-objects.c;h=05a62f4a3ec6eb61883332af53b5aa25a636230e;hp=da49d7503191f695785643dde4ca2eb55e162bc9;hb=626851be97b4332fc0401d754c81ae7bbc0f5dc4;hpb=992c052c34d180dd9fe6bd4f89fff3a481a729dc diff --git a/src/libsystemd-bus/bus-objects.c b/src/libsystemd-bus/bus-objects.c index da49d7503..05a62f4a3 100644 --- a/src/libsystemd-bus/bus-objects.c +++ b/src/libsystemd-bus/bus-objects.c @@ -27,12 +27,14 @@ #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, const char *path, struct node_vtable *c, - void **userdata) { + void **userdata, + sd_bus_error *error) { void *u; int r; @@ -43,8 +45,12 @@ static int node_vtable_get_userdata( u = c->userdata; if (c->find) { - r = c->find(bus, path, c->interface, &u, u); - if (r <= 0) + r = c->find(bus, path, c->interface, u, &u, error); + if (r < 0) + return r; + if (sd_bus_error_is_set(error)) + return sd_bus_error_get_errno(error); + if (r == 0) return r; } @@ -57,14 +63,15 @@ static int node_vtable_get_userdata( static void *vtable_property_convert_userdata(const sd_bus_vtable *p, void *u) { assert(p); - return (uint8_t*) u + p->property.offset; + return (uint8_t*) u + p->x.property.offset; } static int vtable_property_get_userdata( sd_bus *bus, const char *path, struct vtable_member *p, - void **userdata) { + void **userdata, + sd_bus_error *error) { void *u; int r; @@ -74,15 +81,23 @@ static int vtable_property_get_userdata( assert(p); assert(userdata); - r = node_vtable_get_userdata(bus, path, p->parent, &u); + r = node_vtable_get_userdata(bus, path, p->parent, &u, error); if (r <= 0) return r; + if (bus->nodes_modified) + return 0; *userdata = vtable_property_convert_userdata(p->vtable, u); return 1; } -static int add_enumerated_to_set(sd_bus *bus, const char *prefix, struct node_enumerator *first, Set *s) { +static int add_enumerated_to_set( + sd_bus *bus, + const char *prefix, + struct node_enumerator *first, + Set *s, + sd_bus_error *error) { + struct node_enumerator *c; int r; @@ -93,9 +108,14 @@ static int add_enumerated_to_set(sd_bus *bus, const char *prefix, struct node_en LIST_FOREACH(enumerators, c, first) { char **children = NULL, **k; - r = c->callback(bus, prefix, &children, c->userdata); + if (bus->nodes_modified) + return 0; + + r = c->callback(bus, prefix, c->userdata, &children, error); if (r < 0) return r; + if (sd_bus_error_is_set(error)) + return sd_bus_error_get_errno(error); STRV_FOREACH(k, children) { if (r < 0) { @@ -103,13 +123,20 @@ static int add_enumerated_to_set(sd_bus *bus, const char *prefix, struct node_en 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); + if (r == -EEXIST) + r = 0; } free(children); @@ -120,7 +147,13 @@ static int add_enumerated_to_set(sd_bus *bus, const char *prefix, struct node_en return 0; } -static int add_subtree_to_set(sd_bus *bus, const char *prefix, struct node *n, Set *s) { +static int add_subtree_to_set( + sd_bus *bus, + const char *prefix, + struct node *n, + Set *s, + sd_bus_error *error) { + struct node *i; int r; @@ -129,13 +162,18 @@ static int add_subtree_to_set(sd_bus *bus, const char *prefix, struct node *n, S assert(n); assert(s); - r = add_enumerated_to_set(bus, prefix, n->enumerators, s); + r = add_enumerated_to_set(bus, prefix, n->enumerators, s, error); 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; @@ -144,19 +182,28 @@ static int add_subtree_to_set(sd_bus *bus, const char *prefix, struct node *n, S if (r < 0 && r != -EEXIST) return r; - r = add_subtree_to_set(bus, prefix, i, s); + r = add_subtree_to_set(bus, prefix, i, s, error); if (r < 0) return r; + if (bus->nodes_modified) + return 0; } return 0; } -static int get_child_nodes(sd_bus *bus, const char *prefix, struct node *n, Set **_s) { +static int get_child_nodes( + sd_bus *bus, + const char *prefix, + struct node *n, + Set **_s, + sd_bus_error *error) { + Set *s = NULL; int r; assert(bus); + assert(prefix); assert(n); assert(_s); @@ -164,7 +211,7 @@ static int get_child_nodes(sd_bus *bus, const char *prefix, struct node *n, Set if (!s) return -ENOMEM; - r = add_subtree_to_set(bus, prefix, n, s); + r = add_subtree_to_set(bus, prefix, n, s, error); if (r < 0) { set_free_free(s); return r; @@ -189,6 +236,11 @@ static int node_callbacks_run( assert(found_object); LIST_FOREACH(callbacks, c, first) { + _cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL; + + if (bus->nodes_modified) + return 0; + if (require_fallback && !c->is_fallback) continue; @@ -197,11 +249,14 @@ 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; - r = c->callback(bus, m, c->userdata); + r = c->callback(bus, m, c->userdata, &error_buffer); + r = bus_maybe_reply_error(m, r, &error_buffer); if (r != 0) return r; } @@ -216,6 +271,7 @@ static int method_callbacks_run( bool require_fallback, bool *found_object) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; const char *signature; void *u; int r; @@ -228,36 +284,41 @@ static int method_callbacks_run( if (require_fallback && !c->parent->is_fallback) return 0; - r = node_vtable_get_userdata(bus, m->path, c->parent, &u); + r = node_vtable_get_userdata(bus, m->path, c->parent, &u, &error); if (r <= 0) - return r; + return bus_maybe_reply_error(m, r, &error); + 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->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, strempty(c->vtable->method.signature)); - if (r < 0) - return r; + if (!streq(strempty(c->vtable->x.method.signature), signature)) + return sd_bus_reply_method_errorf( + m, + 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)); - return 1; + if (c->vtable->x.method.handler) { + r = c->vtable->x.method.handler(bus, m, u, &error); + return bus_maybe_reply_error(m, r, &error); } - if (c->vtable->method.handler) - return c->vtable->method.handler(bus, m, u); - /* If the method callback is NULL, make this a successful NOP */ - r = sd_bus_reply_method_return(bus, m, NULL); + r = sd_bus_reply_method_return(m, NULL); if (r < 0) return r; @@ -270,29 +331,47 @@ static int invoke_property_get( const char *path, const char *interface, const char *property, - sd_bus_message *m, - sd_bus_error *error, - void *userdata) { + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { + const void *p; int r; - void *p; assert(bus); assert(v); + assert(path); + assert(interface); + assert(property); + assert(reply); - if (v->property.get) - return v->property.get(bus, path, interface, property, m, error, userdata); + if (v->x.property.get) { + r = v->x.property.get(bus, path, interface, property, reply, userdata, error); + if (r < 0) + return r; + if (sd_bus_error_is_set(error)) + return sd_bus_error_get_errno(error); + return r; + } /* Automatic handling if no callback is defined. */ - assert(bus_type_is_basic(v->property.signature[0])); + if (streq(v->x.property.signature, "as")) + return sd_bus_message_append_strv(reply, *(char***) userdata); + + assert(signature_is_single(v->x.property.signature, false)); + assert(bus_type_is_basic(v->x.property.signature[0])); - switch (v->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: @@ -300,11 +379,7 @@ static int invoke_property_get( break; } - r = sd_bus_message_append_basic(m, v->property.signature[0], p); - if (r < 0) - return r; - - return 1; + return sd_bus_message_append_basic(reply, v->x.property.signature[0], p); } static int invoke_property_set( @@ -314,23 +389,33 @@ static int invoke_property_set( const char *interface, const char *property, sd_bus_message *value, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { int r; assert(bus); assert(v); + assert(path); + assert(interface); + assert(property); + assert(value); - if (v->property.set) - return v->property.set(bus, path, interface, property, value, error, userdata); + if (v->x.property.set) { + r = v->x.property.set(bus, path, interface, property, value, userdata, error); + if (r < 0) + return r; + if (sd_bus_error_is_set(error)) + return sd_bus_error_get_errno(error); + return r; + } /* Automatic handling if no callback is defined. */ - assert(signature_is_single(v->property.signature, false)); - assert(bus_type_is_basic(v->property.signature[0])); + assert(signature_is_single(v->x.property.signature, false)); + assert(bus_type_is_basic(v->x.property.signature[0])); - switch (v->property.signature[0]) { + switch (v->x.property.signature[0]) { case SD_BUS_TYPE_STRING: case SD_BUS_TYPE_OBJECT_PATH: @@ -338,7 +423,7 @@ static int invoke_property_set( const char *p; char *n; - r = sd_bus_message_read_basic(value, v->property.signature[0], &p); + r = sd_bus_message_read_basic(value, v->x.property.signature[0], &p); if (r < 0) return r; @@ -353,7 +438,7 @@ static int invoke_property_set( } default: - r = sd_bus_message_read_basic(value, v->property.signature[0], userdata); + r = sd_bus_message_read_basic(value, v->x.property.signature[0], userdata); if (r < 0) return r; @@ -371,46 +456,49 @@ static int property_get_set_callbacks_run( 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; + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; void *u; int r; assert(bus); assert(m); + assert(c); assert(found_object); if (require_fallback && !c->parent->is_fallback) return 0; - r = vtable_property_get_userdata(bus, m->path, c, &u); + r = vtable_property_get_userdata(bus, m->path, c, &u, &error); if (r <= 0) - return r; + return bus_maybe_reply_error(m, r, &error); + if (bus->nodes_modified) + return 0; *found_object = true; - r = sd_bus_message_new_method_return(bus, m, &reply); + r = sd_bus_message_new_method_return(m, &reply); if (r < 0) return r; - c->last_iteration = bus->iteration_counter; - if (is_get) { - r = sd_bus_message_open_container(reply, 'v', c->vtable->property.signature); + /* 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; - r = invoke_property_get(bus, c->vtable, m->path, c->interface, c->member, reply, &error, u); + r = invoke_property_get(bus, c->vtable, m->path, c->interface, c->member, reply, u, &error); if (r < 0) - return r; + return bus_maybe_reply_error(m, r, &error); - if (sd_bus_error_is_set(&error)) { - r = sd_bus_reply_method_error(bus, m, &error); - if (r < 0) - return r; - - return 1; - } + if (bus->nodes_modified) + return 0; r = sd_bus_message_close_container(reply); if (r < 0) @@ -418,24 +506,26 @@ static int property_get_set_callbacks_run( } 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; + return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_PROPERTY_READ_ONLY, "Property '%s' is not writable.", c->member); - r = invoke_property_set(bus, c->vtable, m->path, c->interface, c->member, m, &error, u); - if (r < 0) - return r; - } + /* 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; - if (sd_bus_error_is_set(&error)) { - r = sd_bus_reply_method_error(bus, m, &error); - if (r < 0) - return r; + c->last_iteration = bus->iteration_counter; - return 1; - } + r = sd_bus_message_enter_container(m, 'v', c->vtable->x.property.signature); + if (r < 0) + return r; + + r = invoke_property_set(bus, c->vtable, m->path, c->interface, c->member, m, u, &error); + if (r < 0) + return bus_maybe_reply_error(m, r, &error); + + if (bus->nodes_modified) + return 0; r = sd_bus_message_exit_container(m); if (r < 0) @@ -462,6 +552,7 @@ static int vtable_append_all_properties( assert(bus); assert(reply); + assert(path); assert(c); for (v = c->vtable+1; v->type != _SD_BUS_VTABLE_END; v++) { @@ -472,19 +563,18 @@ static int vtable_append_all_properties( if (r < 0) return r; - r = sd_bus_message_append(reply, "s", c->interface); + r = sd_bus_message_append(reply, "s", v->x.property.member); if (r < 0) return r; - r = sd_bus_message_open_container(reply, 'v', v->property.signature); + r = sd_bus_message_open_container(reply, 'v', v->x.property.signature); if (r < 0) return r; - r = invoke_property_get(bus, v, path, c->interface, v->property.member, reply, error, vtable_property_convert_userdata(v, userdata)); + r = invoke_property_get(bus, v, path, c->interface, v->x.property.member, reply, vtable_property_convert_userdata(v, userdata), error); if (r < 0) return r; - - if (sd_bus_error_is_set(error)) + if (bus->nodes_modified) return 0; r = sd_bus_message_close_container(reply); @@ -509,14 +599,14 @@ 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); assert(m); assert(found_object); - r = sd_bus_message_new_method_return(bus, m, &reply); + r = sd_bus_message_new_method_return(m, &reply); if (r < 0) return r; @@ -524,6 +614,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; @@ -531,9 +626,11 @@ static int property_get_all_callbacks_run( if (require_fallback && !c->is_fallback) continue; - r = node_vtable_get_userdata(bus, m->path, c, &u); + r = node_vtable_get_userdata(bus, m->path, c, &u, &error); if (r < 0) - return r; + return bus_maybe_reply_error(m, r, &error); + if (bus->nodes_modified) + return 0; if (r == 0) continue; @@ -543,25 +640,17 @@ 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; - - if (sd_bus_error_is_set(&error)) { - r = sd_bus_reply_method_error(bus, m, &error); - if (r < 0) - return r; - - return 1; - } + return bus_maybe_reply_error(m, r, &error); + if (bus->nodes_modified) + return 0; } if (!found_interface) { r = sd_bus_reply_method_errorf( - bus, m, - "org.freedesktop.DBus.Error.UnknownInterface", + m, + SD_BUS_ERROR_UNKNOWN_INTERFACE, "Unknown interface '%s'.", iface); if (r < 0) return r; @@ -582,6 +671,7 @@ static int property_get_all_callbacks_run( static bool bus_node_with_object_manager(sd_bus *bus, struct node *n) { assert(bus); + assert(n); if (n->object_manager) return true; @@ -592,12 +682,18 @@ static bool bus_node_with_object_manager(sd_bus *bus, struct node *n) { return false; } -static bool bus_node_exists(sd_bus *bus, struct node *n, const char *path, bool require_fallback) { +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); + assert(path); /* Tests if there's anything attached directly to this node * for the specified path */ @@ -610,12 +706,15 @@ static bool bus_node_exists(sd_bus *bus, struct node *n, const char *path, bool } LIST_FOREACH(vtables, c, n->vtables) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; if (require_fallback && !c->is_fallback) continue; - if (node_vtable_get_userdata(bus, path, c, NULL) > 0) + if (node_vtable_get_userdata(bus, path, c, NULL, &error) > 0) return true; + if (bus->nodes_modified) + return false; } return !require_fallback && (n->enumerators || n->object_manager); @@ -628,8 +727,10 @@ static int process_introspect( bool require_fallback, bool *found_object) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _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; @@ -640,9 +741,11 @@ static int process_introspect( assert(n); assert(found_object); - r = get_child_nodes(bus, m->path, n, &s); + r = get_child_nodes(bus, m->path, n, &s, &error); if (r < 0) - return r; + return bus_maybe_reply_error(m, r, &error); + if (bus->nodes_modified) + return 0; r = introspect_begin(&intro); if (r < 0) @@ -658,26 +761,46 @@ static int process_introspect( if (require_fallback && !c->is_fallback) continue; - r = node_vtable_get_userdata(bus, m->path, c, NULL); - if (r < 0) - return r; + r = node_vtable_get_userdata(bus, m->path, c, NULL, &error); + if (r < 0) { + r = bus_maybe_reply_error(m, r, &error); + goto finish; + } + if (bus->nodes_modified) { + r = 0; + goto finish; + } 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; } @@ -703,53 +826,6 @@ finish: 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, @@ -758,6 +834,8 @@ static int object_manager_serialize_path( bool require_fallback, sd_bus_error *error) { + const char *previous_interface = NULL; + bool found_something = false; struct node_vtable *i; struct node *n; int r; @@ -772,87 +850,132 @@ 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, error); if (r < 0) return r; - if (sd_bus_error_is_set(error)) + if (bus->nodes_modified) return 0; - } + if (r == 0) + continue; - 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; + /* Open the object part */ - return 1; -} + r = sd_bus_message_open_container(reply, 'e', "oa{sa{sv}}"); + if (r < 0) + return r; -static int object_manager_serialize_path_and_fallbacks( - sd_bus *bus, - sd_bus_message *reply, - const char *path, - sd_bus_error *error) { + r = sd_bus_message_append(reply, "o", path); + if (r < 0) + return r; - size_t pl; - int r; + r = sd_bus_message_open_container(reply, 'a', "{sa{sv}}"); + if (r < 0) + return r; - assert(bus); - assert(reply); - assert(path); - assert(error); + found_something = true; + } - /* First, add all vtables registered for this path */ - r = object_manager_serialize_path(bus, reply, path, path, false, error); - if (r < 0) - return r; - if (sd_bus_error_is_set(error)) - return 0; + if (!streq_ptr(previous_interface, i->interface)) { - /* Second, add fallback vtables registered for any of the prefixes */ - pl = strlen(path); - if (pl > 1) { - char p[pl + 1]; - strcpy(p, path); + /* Maybe close the previous interface part */ - for (;;) { - char *e; + if (previous_interface) { + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; - e = strrchr(p, '/'); - if (e == p || !e) - break; + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; + } - *e = 0; + /* Open the new interface part */ - r = object_manager_serialize_path(bus, reply, p, path, true, error); + r = sd_bus_message_open_container(reply, 'e', "sa{sv}"); if (r < 0) return r; - if (sd_bus_error_is_set(error)) - return 0; + 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; } - } - return 0; + r = vtable_append_all_properties(bus, reply, path, i, u, error); + if (r < 0) + return r; + if (bus->nodes_modified) + return 0; + + previous_interface = i->interface; + } + + 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; + } + + 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; +} + +static int object_manager_serialize_path_and_fallbacks( + sd_bus *bus, + sd_bus_message *reply, + const char *path, + sd_bus_error *error) { + + char *prefix; + 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, path, false, error); + if (r < 0) + return r; + if (bus->nodes_modified) + return 0; + + /* Second, add fallback vtables registered for any of the prefixes */ + 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 (bus->nodes_modified) + return 0; + } + + return 0; } static int process_get_managed_objects( @@ -862,6 +985,7 @@ static int process_get_managed_objects( bool require_fallback, bool *found_object) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_set_free_free_ Set *s = NULL; bool empty; @@ -875,11 +999,13 @@ static int process_get_managed_objects( if (!bus_node_with_object_manager(bus, n)) return 0; - r = get_child_nodes(bus, m->path, n, &s); + r = get_child_nodes(bus, m->path, n, &s, &error); if (r < 0) return r; + if (bus->nodes_modified) + return 0; - r = sd_bus_message_new_method_return(bus, m, &reply); + r = sd_bus_message_new_method_return(m, &reply); if (r < 0) return r; @@ -916,19 +1042,12 @@ static int process_get_managed_objects( 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 r; - return 1; - } + if (bus->nodes_modified) + return 0; } } @@ -967,6 +1086,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; @@ -981,6 +1102,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 */ @@ -999,7 +1122,7 @@ static int object_find_and_run( r = sd_bus_message_read(m, "ss", &vtable_key.interface, &vtable_key.member); if (r < 0) - return r; + return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_INVALID_ARGS, "Expected interface and member parameters"); v = hashmap_get(bus->vtable_properties, &vtable_key); if (v) { @@ -1017,7 +1140,7 @@ static int object_find_and_run( r = sd_bus_message_read(m, "s", &iface); if (r < 0) - return r; + return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_INVALID_ARGS, "Expected interface parameter"); if (iface[0] == 0) iface = NULL; @@ -1029,22 +1152,30 @@ static int object_find_and_run( } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) { + if (!isempty(sd_bus_message_get_signature(m, true))) + return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_INVALID_ARGS, "Expected no parameters"); + 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")) { + if (!isempty(sd_bus_message_get_signature(m, true))) + return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_INVALID_ARGS, "Expected no parameters"); + r = process_get_managed_objects(bus, m, n, require_fallback, found_object); if (r != 0) 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; } @@ -1060,7 +1191,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) @@ -1071,7 +1202,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; @@ -1080,24 +1211,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; } @@ -1110,13 +1229,13 @@ int bus_process_object(sd_bus *bus, sd_bus_message *m) { 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", + m, + SD_BUS_ERROR_UNKNOWN_PROPERTY, "Unknown property or interface."); else r = sd_bus_reply_method_errorf( - bus, m, - "org.freedesktop.DBus.Error.UnknownMethod", + m, + SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method '%s' or interface '%s'.", m->member, m->interface); if (r < 0) @@ -1177,7 +1296,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; } @@ -1198,7 +1317,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); @@ -1206,7 +1325,7 @@ static void bus_node_gc(sd_bus *b, struct node *n) { } static int bus_add_object( - sd_bus *b, + sd_bus *bus, bool fallback, const char *path, sd_bus_message_handler_t callback, @@ -1216,16 +1335,12 @@ static int bus_add_object( 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; + assert_return(bus, -EINVAL); + assert_return(object_path_is_valid(path), -EINVAL); + assert_return(callback, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); - n = bus_node_allocate(b, path); + n = bus_node_allocate(bus, path); if (!n) return -ENOMEM; @@ -1240,12 +1355,14 @@ 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: free(c); - bus_node_gc(b, n); + bus_node_gc(bus, n); return r; } @@ -1259,14 +1376,10 @@ static int bus_remove_object( 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; + assert_return(bus, -EINVAL); + assert_return(object_path_is_valid(path), -EINVAL); + assert_return(callback, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); n = hashmap_get(bus->nodes, path); if (!n) @@ -1278,27 +1391,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); } @@ -1321,7 +1451,7 @@ static void free_node_vtable(sd_bus *bus, struct node_vtable *w) { key.path = w->node->path; key.interface = w->interface; - key.member = v->method.member; + key.member = v->x.method.member; x = hashmap_remove(bus->vtable_methods, &key); break; @@ -1333,7 +1463,7 @@ static void free_node_vtable(sd_bus *bus, struct node_vtable *w) { key.path = w->node->path; key.interface = w->interface; - key.member = v->property.member; + key.member = v->x.property.member; x = hashmap_remove(bus->vtable_properties, &key); break; }} @@ -1349,6 +1479,8 @@ static void free_node_vtable(sd_bus *bus, struct node_vtable *w) { static unsigned vtable_member_hash_func(const void *a) { const struct vtable_member *m = a; + assert(m); + return string_hash_func(m->path) ^ string_hash_func(m->interface) ^ @@ -1359,6 +1491,9 @@ static int vtable_member_compare_func(const void *a, const void *b) { const struct vtable_member *x = a, *y = b; int r; + assert(x); + assert(y); + r = strcmp(x->path, y->path); if (r != 0) return r; @@ -1379,21 +1514,22 @@ 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; - 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; + assert_return(bus, -EINVAL); + assert_return(object_path_is_valid(path), -EINVAL); + assert_return(interface_name_is_valid(interface), -EINVAL); + assert_return(vtable, -EINVAL); + 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) @@ -1408,15 +1544,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); @@ -1444,10 +1585,10 @@ static int add_object_vtable_internal( case _SD_BUS_VTABLE_METHOD: { struct vtable_member *m; - if (!member_name_is_valid(v->method.member) || - !signature_is_valid(strempty(v->method.signature), false) || - !signature_is_valid(strempty(v->method.result), false) || - !(v->method.handler || (isempty(v->method.signature) && isempty(v->method.result))) || + if (!member_name_is_valid(v->x.method.member) || + !signature_is_valid(strempty(v->x.method.signature), false) || + !signature_is_valid(strempty(v->x.method.result), false) || + !(v->x.method.handler || (isempty(v->x.method.signature) && isempty(v->x.method.result))) || v->flags & (SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE|SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY)) { r = -EINVAL; goto fail; @@ -1462,7 +1603,7 @@ static int add_object_vtable_internal( m->parent = c; m->path = n->path; m->interface = c->interface; - m->member = v->method.member; + m->member = v->x.method.member; m->vtable = v; r = hashmap_put(bus->vtable_methods, m, m); @@ -1476,7 +1617,7 @@ static int add_object_vtable_internal( case _SD_BUS_VTABLE_WRITABLE_PROPERTY: - if (!(v->property.set || bus_type_is_basic(v->property.signature[0]))) { + if (!(v->x.property.set || bus_type_is_basic(v->x.property.signature[0]))) { r = -EINVAL; goto fail; } @@ -1486,9 +1627,9 @@ static int add_object_vtable_internal( case _SD_BUS_VTABLE_PROPERTY: { struct vtable_member *m; - if (!member_name_is_valid(v->property.member) || - !signature_is_single(v->property.signature, false) || - !(v->property.get || bus_type_is_basic(v->property.signature[0])) || + 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]) || 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; @@ -1505,7 +1646,7 @@ static int add_object_vtable_internal( m->parent = c; m->path = n->path; m->interface = c->interface; - m->member = v->property.member; + m->member = v->x.property.member; m->vtable = v; r = hashmap_put(bus->vtable_properties, m, m); @@ -1519,8 +1660,8 @@ static int add_object_vtable_internal( case _SD_BUS_VTABLE_SIGNAL: - if (!member_name_is_valid(v->signal.member) || - !signature_is_single(strempty(v->signal.signature), false)) { + if (!member_name_is_valid(v->x.signal.member) || + !signature_is_valid(strempty(v->x.signal.signature), false)) { r = -EINVAL; goto fail; } @@ -1533,7 +1674,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: @@ -1548,38 +1691,45 @@ 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; - if (!bus) - return -EINVAL; - if (!object_path_is_valid(path)) - return -EINVAL; - if (!interface_name_is_valid(interface)) - return -EINVAL; - if (bus_pid_changed(bus)) - return -ECHILD; + assert_return(bus, -EINVAL); + assert_return(object_path_is_valid(path), -EINVAL); + assert_return(interface_name_is_valid(interface), -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); n = hashmap_get(bus->nodes, path); if (!n) 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, @@ -1589,15 +1739,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, @@ -1608,15 +1760,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, @@ -1626,14 +1781,10 @@ int sd_bus_add_node_enumerator( 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; + assert_return(bus, -EINVAL); + assert_return(object_path_is_valid(path), -EINVAL); + assert_return(callback, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); n = bus_node_allocate(bus, path); if (!n) @@ -1649,7 +1800,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: @@ -1658,7 +1812,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, @@ -1667,14 +1821,10 @@ int sd_bus_remove_node_enumerator( struct node_enumerator *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; + assert_return(bus, -EINVAL); + assert_return(object_path_is_valid(path), -EINVAL); + assert_return(callback, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); n = hashmap_get(bus->nodes, path); if (!n) @@ -1687,11 +1837,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; } @@ -1703,9 +1855,10 @@ static int emit_properties_changed_on_interface( bool require_fallback, char **names) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _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; @@ -1713,6 +1866,7 @@ static int emit_properties_changed_on_interface( int r; assert(bus); + assert(prefix); assert(path); assert(interface); @@ -1720,21 +1874,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; @@ -1750,52 +1889,77 @@ 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; - - key.member = *property; - v = hashmap_get(bus->vtable_properties, &key); - if (!v) - return -ENOENT; - - 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_EMITS_CHANGE)) - return -EDOM; - 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, &error); 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) { + struct vtable_member *v; - r = sd_bus_message_open_container(m, 'v', v->vtable->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, vtable_property_convert_userdata(v->vtable, 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; + + 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; @@ -1805,19 +1969,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, &error); 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; + } } } @@ -1832,97 +2012,309 @@ static int emit_properties_changed_on_interface( return 1; } -int sd_bus_emit_properties_changed_strv(sd_bus *bus, const char *path, const char *interface, char **names) { - size_t pl; +_public_ int sd_bus_emit_properties_changed_strv( + sd_bus *bus, + const char *path, + const char *interface, + char **names) { + + BUS_DONT_DESTROY(bus); + char *prefix; int r; - if (!bus) - return -EINVAL; - if (!object_path_is_valid(path)) - return -EINVAL; - if (!interface_name_is_valid(interface)) - return -EINVAL; + assert_return(bus, -EINVAL); + assert_return(object_path_is_valid(path), -EINVAL); + assert_return(interface_name_is_valid(interface), -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(!bus_pid_changed(bus), -ECHILD); - r = emit_properties_changed_on_interface(bus, path, path, interface, false, names); - if (r != 0) - return r; + if (strv_isempty(names)) + return 0; - pl = strlen(path); - if (pl > 1 ) { - char p[pl+1]; + do { + bus->nodes_modified = false; - strcpy(p, path); - for (;;) { - char *e; + r = emit_properties_changed_on_interface(bus, path, path, interface, false, names); + if (r != 0) + return r; + if (bus->nodes_modified) + continue; - if (streq(p, "/")) + 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; + } - e = strrchr(p, '/'); - assert(e); - if (e == p) - *(e+1) = 0; - else - *e = 0; + } while (bus->nodes_modified); - r = emit_properties_changed_on_interface(bus, p, path, interface, true, names); - if (r != 0) + return -ENOENT; +} + +_public_ int sd_bus_emit_properties_changed( + sd_bus *bus, + const char *path, + const char *interface, + const char *name, ...) { + + char **names; + + assert_return(bus, -EINVAL); + assert_return(object_path_is_valid(path), -EINVAL); + assert_return(interface_name_is_valid(interface), -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(!bus_pid_changed(bus), -ECHILD); + + if (!name) + return 0; + + names = strv_from_stdarg_alloca(name); + + return sd_bus_emit_properties_changed_strv(bus, path, interface, names); +} + +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, &error); + 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; +} + +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_properties_changed(sd_bus *bus, const char *path, const char *interface, const char *name, ...) { - _cleanup_strv_free_ char **names = NULL; - va_list ap; +_public_ int sd_bus_emit_interfaces_added_strv(sd_bus *bus, const char *path, char **interfaces) { + BUS_DONT_DESTROY(bus); - va_start(ap, name); - names = strv_new_ap(name, ap); - va_end(ap); + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + char **i; + int r; - if (!names) - return -ENOMEM; + 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); - return sd_bus_emit_properties_changed_strv(bus, path, interface, names); + 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); } -int sd_bus_emit_interfaces_added(sd_bus *bus, const char *path, const char *interfaces, ...) { - return -ENOSYS; +_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); } -int sd_bus_emit_interfaces_removed(sd_bus *bus, const char *path, const char *interfaces, ...) { - return -ENOSYS; +_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; - if (!bus) - return -EINVAL; - if (!object_path_is_valid(path)) - return -EINVAL; - if (bus_pid_changed(bus)) - return -ECHILD; + assert_return(bus, -EINVAL); + assert_return(object_path_is_valid(path), -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); n = bus_node_allocate(bus, path); if (!n) 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; - if (!bus) - return -EINVAL; - if (!object_path_is_valid(path)) - return -EINVAL; - if (bus_pid_changed(bus)) - return -ECHILD; + assert_return(bus, -EINVAL); + assert_return(object_path_is_valid(path), -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); n = hashmap_get(bus->nodes, path); if (!n) @@ -1932,6 +2324,8 @@ 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; }