X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-objects.c;h=92781e9adcc1ef2192c40c4657f9759b03632dd8;hb=c13c7de3bf419db3ae93a9acd2d95a5a19e408ed;hp=da49d7503191f695785643dde4ca2eb55e162bc9;hpb=992c052c34d180dd9fe6bd4f89fff3a481a729dc;p=elogind.git diff --git a/src/libsystemd-bus/bus-objects.c b/src/libsystemd-bus/bus-objects.c index da49d7503..92781e9ad 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, @@ -57,7 +58,7 @@ 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( @@ -77,12 +78,19 @@ 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; } -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) { + struct node_enumerator *c; int r; @@ -93,6 +101,9 @@ static int add_enumerated_to_set(sd_bus *bus, const char *prefix, struct node_en 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; @@ -120,7 +131,12 @@ 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) { + struct node *i; int r; @@ -132,6 +148,8 @@ static int add_subtree_to_set(sd_bus *bus, const char *prefix, struct node *n, S 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; @@ -147,16 +165,24 @@ static int add_subtree_to_set(sd_bus *bus, const char *prefix, struct node *n, S r = add_subtree_to_set(bus, prefix, i, s); 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) { + Set *s = NULL; int r; assert(bus); + assert(prefix); assert(n); assert(_s); @@ -189,6 +215,9 @@ static int node_callbacks_run( assert(found_object); LIST_FOREACH(callbacks, c, first) { + if (bus->nodes_modified) + return 0; + if (require_fallback && !c->is_fallback) continue; @@ -197,6 +226,8 @@ static int node_callbacks_run( if (c->last_iteration == bus->iteration_counter) continue; + c->last_iteration = bus->iteration_counter; + r = sd_bus_message_rewind(m, true); if (r < 0) return r; @@ -231,30 +262,37 @@ 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->method.signature), signature)) { + 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->method.signature)); + signature, c->interface, c->member, strempty(c->vtable->x.method.signature)); if (r < 0) return r; return 1; } - if (c->vtable->method.handler) - return c->vtable->method.handler(bus, m, u); + if (c->vtable->x.method.handler) + return c->vtable->x.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); @@ -274,25 +312,36 @@ static int invoke_property_get( sd_bus_error *error, void *userdata) { - int r; - void *p; + const void *p; assert(bus); assert(v); + assert(path); + assert(interface); + assert(property); + assert(m); - if (v->property.get) - return v->property.get(bus, path, interface, property, m, error, userdata); + if (v->x.property.get) + return v->x.property.get(bus, path, interface, property, m, error, userdata); /* 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(m, *(char***) userdata); - switch (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->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 +349,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(m, v->x.property.signature[0], p); } static int invoke_property_set( @@ -321,16 +366,20 @@ static int invoke_property_set( 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) + return v->x.property.set(bus, path, interface, property, value, error, userdata); /* 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 +387,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 +402,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; @@ -378,6 +427,7 @@ static int property_get_set_callbacks_run( assert(bus); assert(m); + assert(c); assert(found_object); if (require_fallback && !c->parent->is_fallback) @@ -386,6 +436,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; @@ -393,10 +445,15 @@ static int property_get_set_callbacks_run( 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; @@ -412,15 +469,27 @@ 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 { - r = sd_bus_message_enter_container(m, 'v', c->vtable->property.signature); + /* 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; @@ -437,6 +506,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; @@ -462,6 +534,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,20 +545,21 @@ 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, 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) @@ -509,7 +583,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); @@ -524,6 +598,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; @@ -534,6 +613,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; @@ -543,8 +624,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; @@ -556,12 +635,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; @@ -582,6 +663,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 +674,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 */ @@ -616,6 +704,8 @@ static bool bus_node_exists(sd_bus *bus, struct node *n, const char *path, bool 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); @@ -643,6 +733,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) @@ -661,6 +753,8 @@ static int process_introspect( r = node_vtable_get_userdata(bus, m->path, c, NULL); if (r < 0) return r; + if (bus->nodes_modified) + return 0; if (r == 0) continue; @@ -677,7 +771,8 @@ static int process_introspect( r = bus_node_exists(bus, n, m->path, require_fallback); if (r < 0) return r; - + if (bus->nodes_modified) + return 0; if (r == 0) goto finish; } @@ -708,9 +803,9 @@ static int object_manager_serialize_vtable( sd_bus_message *reply, const char *path, struct node_vtable *c, - sd_bus_error *error) { + sd_bus_error *error, + void *userdata) { - void *u; int r; assert(bus); @@ -719,10 +814,6 @@ static int object_manager_serialize_vtable( assert(c); assert(error); - r = node_vtable_get_userdata(bus, path, c, &u); - if (r <= 0) - return r; - r = sd_bus_message_open_container(reply, 'e', "sa{sv}"); if (r < 0) return r; @@ -735,9 +826,11 @@ static int object_manager_serialize_vtable( if (r < 0) return r; - r = vtable_append_all_properties(bus, reply, path, c, u, error); + r = vtable_append_all_properties(bus, reply, path, c, userdata, error); if (r < 0) return r; + if (bus->nodes_modified) + return 0; r = sd_bus_message_close_container(reply); if (r < 0) @@ -760,6 +853,7 @@ static int object_manager_serialize_path( struct node_vtable *i; struct node *n; + bool found_something = false; int r; assert(bus); @@ -772,37 +866,54 @@ static int object_manager_serialize_path( if (!n) return 0; - r = sd_bus_message_open_container(reply, 'e', "oa{sa{sv}}"); - if (r < 0) - return r; - - r = sd_bus_message_append(reply, "o", path); - if (r < 0) - return r; - - r = sd_bus_message_open_container(reply, 'a', "{sa{sv}}"); - if (r < 0) - return r; - LIST_FOREACH(vtables, i, n->vtables) { + void *u; if (require_fallback && !i->is_fallback) continue; - r = object_manager_serialize_vtable(bus, reply, path, i, error); + r = node_vtable_get_userdata(bus, path, i, &u); + if (r < 0) + return r; + if (bus->nodes_modified) + return 0; + if (r == 0) + continue; + + if (!found_something) { + r = sd_bus_message_open_container(reply, 'e', "oa{sa{sv}}"); + if (r < 0) + return r; + + r = sd_bus_message_append(reply, "o", path); + if (r < 0) + return r; + + r = sd_bus_message_open_container(reply, 'a', "{sa{sv}}"); + if (r < 0) + return r; + + found_something = true; + } + + r = object_manager_serialize_vtable(bus, reply, path, i, error, u); if (r < 0) return r; if (sd_bus_error_is_set(error)) return 0; + if (bus->nodes_modified) + return 0; } - r = sd_bus_message_close_container(reply); - if (r < 0) - return r; + if (found_something) { + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; - r = sd_bus_message_close_container(reply); - if (r < 0) - return r; + r = sd_bus_message_close_container(reply); + if (r < 0) + return r; + } return 1; } @@ -813,7 +924,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); @@ -827,29 +938,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; @@ -878,6 +979,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) @@ -929,6 +1032,9 @@ static int process_get_managed_objects( return 1; } + + if (bus->nodes_modified) + return 0; } } @@ -967,6 +1073,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 +1089,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 */ @@ -1040,11 +1150,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; } @@ -1060,7 +1172,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 +1183,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 +1192,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; } @@ -1111,12 +1211,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) @@ -1177,7 +1277,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 +1298,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 +1306,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 +1316,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 +1336,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 +1357,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,10 +1372,11 @@ static int bus_remove_object( if (!c) return 0; - LIST_REMOVE(struct node_callback, callbacks, n->callbacks, c); + LIST_REMOVE(callbacks, n->callbacks, c); free(c); bus_node_gc(bus, n); + bus->nodes_modified = true; return 1; } @@ -1321,7 +1416,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 +1428,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 +1444,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 +1456,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; @@ -1384,16 +1484,13 @@ static int add_object_vtable_internal( 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); r = hashmap_ensure_allocated(&bus->vtable_methods, vtable_member_hash_func, vtable_member_compare_func); if (r < 0) @@ -1444,10 +1541,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 +1559,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 +1573,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 +1583,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 +1602,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 +1616,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 +1630,9 @@ static int add_object_vtable_internal( } } - LIST_PREPEND(struct node_vtable, vtables, n->vtables, c); + LIST_PREPEND(vtables, n->vtables, c); + bus->nodes_modified = true; + return 0; fail: @@ -1553,14 +1652,10 @@ static int remove_object_vtable_internal( 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) @@ -1573,9 +1668,13 @@ static int remove_object_vtable_internal( if (!c) return 0; - LIST_REMOVE(struct node_vtable, vtables, n->vtables, c); + LIST_REMOVE(vtables, n->vtables, c); free_node_vtable(bus, c); + bus_node_gc(bus, n); + + bus->nodes_modified = true; + return 1; } @@ -1626,14 +1725,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 +1744,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: @@ -1667,14 +1765,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 +1781,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; } @@ -1713,6 +1809,7 @@ static int emit_properties_changed_on_interface( int r; assert(bus); + assert(prefix); assert(path); assert(interface); @@ -1734,6 +1831,8 @@ static int emit_properties_changed_on_interface( r = node_vtable_get_userdata(bus, path, c, &u); if (r <= 0) return r; + if (bus->nodes_modified) + return 0; r = sd_bus_message_new_signal(bus, path, "org.freedesktop.DBus.Properties", "PropertiesChanged", &m); if (r < 0) @@ -1754,15 +1853,16 @@ static int emit_properties_changed_on_interface( _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); - if (!(v->vtable->flags & SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE)) - return -EDOM; if (v->vtable->flags & SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY) { has_invalidating = true; continue; @@ -1776,16 +1876,15 @@ static int emit_properties_changed_on_interface( if (r < 0) return r; - r = sd_bus_message_open_container(m, 'v', v->vtable->property.signature); + 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 (sd_bus_error_is_set(&error)) - return bus_error_to_errno(&error); + if (bus->nodes_modified) + return 0; r = sd_bus_message_close_container(m); if (r < 0) @@ -1832,97 +1931,303 @@ 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; +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); + + if (strv_isempty(names)) + return 0; + + do { + bus->nodes_modified = false; + + r = emit_properties_changed_on_interface(bus, path, path, interface, false, names); + if (r != 0) + return r; + if (bus->nodes_modified) + continue; + + 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( + 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; + struct node_vtable *c; + struct node *n; + void *u = NULL; + int r; + + assert(bus); + assert(m); + assert(prefix); + assert(path); + assert(interface); + + n = hashmap_get(bus->nodes, prefix); + if (!n) + return 0; + + LIST_FOREACH(vtables, c, n->vtables) { + if (require_fallback && !c->is_fallback) + continue; + + if (streq(c->interface, interface)) + break; + } + + if (!c) + return 0; + + r = node_vtable_get_userdata(bus, path, c, &u); + if (r <= 0) + return r; + if (bus->nodes_modified) + return 0; + + r = sd_bus_message_append_basic(m, 's', interface); + if (r < 0) + return r; + + r = sd_bus_message_open_container(m, 'a', "{sv}"); + if (r < 0) + return r; + + r = vtable_append_all_properties(bus, m,path, c, u, &error); + if (r < 0) + return r; + if (bus->nodes_modified) + return 0; + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + + return 1; +} + +static int interfaces_added_append_one( + sd_bus *bus, + sd_bus_message *m, + const char *path, + const char *interface) { + + char *prefix; + int r; + + assert(bus); + assert(m); + assert(path); + assert(interface); - r = emit_properties_changed_on_interface(bus, path, path, interface, false, names); + r = interfaces_added_append_one_prefix(bus, m, path, path, interface, false); if (r != 0) return r; + if (bus->nodes_modified) + return 0; - pl = strlen(path); - if (pl > 1 ) { - char p[pl+1]; + 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; +} - strcpy(p, path); - for (;;) { - char *e; +int sd_bus_emit_interfaces_added_strv(sd_bus *bus, const char *path, char **interfaces) { + BUS_DONT_DESTROY(bus); - if (streq(p, "/")) - break; + _cleanup_bus_message_unref_ sd_bus_message *m = NULL; + char **i; + int r; - e = strrchr(p, '/'); - assert(e); - if (e == p) - *(e+1) = 0; - else - *e = 0; + 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); - r = emit_properties_changed_on_interface(bus, p, path, interface, true, names); - if (r != 0) + 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; } - } - return -ENOENT; + if (bus->nodes_modified) + continue; + + r = sd_bus_message_close_container(m); + if (r < 0) + return r; + + } while (bus->nodes_modified); + + return sd_bus_send(bus, m, NULL); } -int sd_bus_emit_properties_changed(sd_bus *bus, const char *path, const char *interface, const char *name, ...) { - _cleanup_strv_free_ char **names = NULL; - va_list ap; +int sd_bus_emit_interfaces_added(sd_bus *bus, const char *path, const char *interface, ...) { + char **interfaces; - va_start(ap, name); - names = strv_new_ap(name, ap); - va_end(ap); + 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 (!names) - return -ENOMEM; + interfaces = strv_from_stdarg_alloca(interface); - return sd_bus_emit_properties_changed_strv(bus, path, interface, names); + 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; +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; +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) { 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) { 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 +2237,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; }