X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-bus%2Fbus-objects.c;h=6162d12c1d38854776a9c8a2f47078d89044843a;hb=fed1e721fd0c81e60c77120539f34e16c2585634;hp=08792fea22bd6080745240b3cd6d00482642a500;hpb=09365592341b4ba4ceca677bb551dcde811e0333;p=elogind.git diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c index 08792fea2..6162d12c1 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -28,8 +28,9 @@ #include "bus-type.h" #include "bus-signature.h" #include "bus-introspect.h" -#include "bus-objects.h" #include "bus-util.h" +#include "bus-slot.h" +#include "bus-objects.h" static int node_vtable_get_userdata( sd_bus *bus, @@ -38,6 +39,7 @@ static int node_vtable_get_userdata( void **userdata, sd_bus_error *error) { + sd_bus_slot *s; void *u; int r; @@ -45,9 +47,15 @@ static int node_vtable_get_userdata( assert(path); assert(c); - u = c->userdata; + s = container_of(c, sd_bus_slot, node_vtable); + u = s->userdata; if (c->find) { + bus->current_slot = sd_bus_slot_ref(s); + bus->current_userdata = u; r = c->find(bus, path, c->interface, u, &u, error); + bus->current_userdata = NULL; + bus->current_slot = sd_bus_slot_unref(s); + if (r < 0) return r; if (sd_bus_error_is_set(error)) @@ -109,11 +117,19 @@ static int add_enumerated_to_set( LIST_FOREACH(enumerators, c, first) { char **children = NULL, **k; + sd_bus_slot *slot; if (bus->nodes_modified) return 0; - r = c->callback(bus, prefix, c->userdata, &children, error); + slot = container_of(c, sd_bus_slot, node_enumerator); + + bus->current_slot = sd_bus_slot_ref(slot); + bus->current_userdata = slot->userdata; + r = c->callback(bus, prefix, slot->userdata, &children, error); + bus->current_userdata = NULL; + bus->current_slot = sd_bus_slot_unref(slot); + if (r < 0) return r; if (sd_bus_error_is_set(error)) @@ -209,7 +225,7 @@ static int get_child_nodes( assert(n); assert(_s); - s = set_new(string_hash_func, string_compare_func); + s = set_new(&string_hash_ops); if (!s) return -ENOMEM; @@ -239,6 +255,7 @@ static int node_callbacks_run( LIST_FOREACH(callbacks, c, first) { _cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL; + sd_bus_slot *slot; if (bus->nodes_modified) return 0; @@ -257,7 +274,16 @@ static int node_callbacks_run( if (r < 0) return r; - r = c->callback(bus, m, c->userdata, &error_buffer); + slot = container_of(c, sd_bus_slot, node_callback); + + bus->current_slot = sd_bus_slot_ref(slot); + bus->current_handler = c->callback; + bus->current_userdata = slot->userdata; + r = c->callback(bus, m, slot->userdata, &error_buffer); + bus->current_userdata = NULL; + bus->current_handler = NULL; + bus->current_slot = sd_bus_slot_unref(slot); + r = bus_maybe_reply_error(m, r, &error_buffer); if (r != 0) return r; @@ -269,9 +295,7 @@ static int node_callbacks_run( #define CAPABILITY_SHIFT(x) (((x) >> __builtin_ctzll(_SD_BUS_VTABLE_CAPABILITY_MASK)) & 0xFFFF) static int check_access(sd_bus *bus, sd_bus_message *m, struct vtable_member *c, sd_bus_error *error) { - _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; uint64_t cap; - uid_t uid; int r; assert(bus); @@ -286,17 +310,6 @@ static int check_access(sd_bus *bus, sd_bus_message *m, struct vtable_member *c, if (c->vtable->flags & SD_BUS_VTABLE_UNPRIVILEGED) return 0; - /* If we are not connected to kdbus we cannot retrieve the - * effective capability set without race. Since we need this - * for a security decision we cannot use racy data, hence - * don't request it. */ - if (bus->is_kernel) - r = sd_bus_query_sender_creds(m, SD_BUS_CREDS_UID|SD_BUS_CREDS_EFFECTIVE_CAPS, &creds); - else - r = sd_bus_query_sender_creds(m, SD_BUS_CREDS_UID, &creds); - if (r < 0) - return r; - /* Check have the caller has the requested capability * set. Note that the flags value contains the capability * number plus one, which we need to subtract here. We do this @@ -310,16 +323,11 @@ static int check_access(sd_bus *bus, sd_bus_message *m, struct vtable_member *c, else cap --; - r = sd_bus_creds_has_effective_cap(creds, cap); + r = sd_bus_query_sender_privilege(m, cap); + if (r < 0) + return r; if (r > 0) - return 1; - - /* Caller has same UID as us, then let's grant access */ - r = sd_bus_creds_get_uid(creds, &uid); - if (r >= 0) { - if (uid == getuid()) - return 1; - } + return 0; return sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Access to %s.%s() not permitted.", c->interface, c->member); } @@ -382,7 +390,18 @@ static int method_callbacks_run( m->enforced_reply_signature = strempty(c->vtable->x.method.result); if (c->vtable->x.method.handler) { + sd_bus_slot *slot; + + slot = container_of(c->parent, sd_bus_slot, node_vtable); + + bus->current_slot = sd_bus_slot_ref(slot); + bus->current_handler = c->vtable->x.method.handler; + bus->current_userdata = u; r = c->vtable->x.method.handler(bus, m, u, &error); + bus->current_userdata = NULL; + bus->current_handler = NULL; + bus->current_slot = sd_bus_slot_unref(slot); + return bus_maybe_reply_error(m, r, &error); } @@ -396,6 +415,7 @@ static int method_callbacks_run( static int invoke_property_get( sd_bus *bus, + sd_bus_slot *slot, const sd_bus_vtable *v, const char *path, const char *interface, @@ -408,6 +428,7 @@ static int invoke_property_get( int r; assert(bus); + assert(slot); assert(v); assert(path); assert(interface); @@ -415,7 +436,13 @@ static int invoke_property_get( assert(reply); if (v->x.property.get) { + + bus->current_slot = sd_bus_slot_ref(slot); + bus->current_userdata = userdata; r = v->x.property.get(bus, path, interface, property, reply, userdata, error); + bus->current_userdata = NULL; + bus->current_slot = sd_bus_slot_unref(slot); + if (r < 0) return r; if (sd_bus_error_is_set(error)) @@ -453,6 +480,7 @@ static int invoke_property_get( static int invoke_property_set( sd_bus *bus, + sd_bus_slot *slot, const sd_bus_vtable *v, const char *path, const char *interface, @@ -464,6 +492,7 @@ static int invoke_property_set( int r; assert(bus); + assert(slot); assert(v); assert(path); assert(interface); @@ -471,7 +500,13 @@ static int invoke_property_set( assert(value); if (v->x.property.set) { + + bus->current_slot = sd_bus_slot_ref(slot); + bus->current_userdata = userdata; r = v->x.property.set(bus, path, interface, property, value, userdata, error); + bus->current_userdata = NULL; + bus->current_slot = sd_bus_slot_unref(slot); + if (r < 0) return r; if (sd_bus_error_is_set(error)) @@ -527,6 +562,7 @@ static int property_get_set_callbacks_run( _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + sd_bus_slot *slot; void *u = NULL; int r; @@ -544,6 +580,8 @@ static int property_get_set_callbacks_run( if (bus->nodes_modified) return 0; + slot = container_of(c->parent, sd_bus_slot, node_vtable); + *found_object = true; r = sd_bus_message_new_method_return(m, &reply); @@ -567,7 +605,7 @@ static int property_get_set_callbacks_run( * PropertiesChanged signals broadcast contents * anyway. */ - r = invoke_property_get(bus, c->vtable, m->path, c->interface, c->member, reply, u, &error); + r = invoke_property_get(bus, slot, c->vtable, m->path, c->interface, c->member, reply, u, &error); if (r < 0) return bus_maybe_reply_error(m, r, &error); @@ -579,6 +617,9 @@ static int property_get_set_callbacks_run( return r; } else { + const char *signature = NULL; + char type = 0; + if (c->vtable->type != _SD_BUS_VTABLE_WRITABLE_PROPERTY) return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_PROPERTY_READ_ONLY, "Property '%s' is not writable.", c->member); @@ -590,6 +631,13 @@ static int property_get_set_callbacks_run( c->last_iteration = bus->iteration_counter; + r = sd_bus_message_peek_type(m, &type, &signature); + if (r < 0) + return r; + + if (type != 'v' || !streq(strempty(signature), strempty(c->vtable->x.property.signature))) + return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_INVALID_ARGS, "Incorrect parameters for property '%s', expected '%s', got '%s'.", c->member, strempty(c->vtable->x.property.signature), strempty(signature)); + r = sd_bus_message_enter_container(m, 'v', c->vtable->x.property.signature); if (r < 0) return r; @@ -598,7 +646,7 @@ static int property_get_set_callbacks_run( if (r < 0) return bus_maybe_reply_error(m, r, &error); - r = invoke_property_set(bus, c->vtable, m->path, c->interface, c->member, m, u, &error); + r = invoke_property_set(bus, slot, c->vtable, m->path, c->interface, c->member, m, u, &error); if (r < 0) return bus_maybe_reply_error(m, r, &error); @@ -626,6 +674,7 @@ static int vtable_append_one_property( void *userdata, sd_bus_error *error) { + sd_bus_slot *slot; int r; assert(bus); @@ -646,7 +695,9 @@ static int vtable_append_one_property( if (r < 0) return r; - r = invoke_property_get(bus, v, path, c->interface, v->x.property.member, reply, vtable_property_convert_userdata(v, userdata), error); + slot = container_of(c, sd_bus_slot, node_vtable); + + r = invoke_property_get(bus, slot, v, path, c->interface, v->x.property.member, reply, vtable_property_convert_userdata(v, userdata), error); if (r < 0) return r; if (bus->nodes_modified) @@ -779,20 +830,7 @@ static int property_get_all_callbacks_run( return 1; } -static bool bus_node_with_object_manager(sd_bus *bus, struct node *n) { - assert(bus); - assert(n); - - if (n->object_manager) - return true; - - if (n->parent) - return bus_node_with_object_manager(bus, n->parent); - - return false; -} - -static bool bus_node_exists( +static int bus_node_exists( sd_bus *bus, struct node *n, const char *path, @@ -800,6 +838,7 @@ static bool bus_node_exists( struct node_vtable *c; struct node_callback *k; + int r; assert(bus); assert(n); @@ -808,11 +847,14 @@ static bool bus_node_exists( /* Tests if there's anything attached directly to this node * for the specified path */ + if (!require_fallback && (n->enumerators || n->object_managers)) + return true; + LIST_FOREACH(callbacks, k, n->callbacks) { if (require_fallback && !k->is_fallback) continue; - return true; + return 1; } LIST_FOREACH(vtables, c, n->vtables) { @@ -821,13 +863,14 @@ static bool bus_node_exists( if (require_fallback && !c->is_fallback) continue; - if (node_vtable_get_userdata(bus, path, c, NULL, &error) > 0) - return true; + r = node_vtable_get_userdata(bus, path, c, NULL, &error); + if (r != 0) + return r; if (bus->nodes_modified) - return false; + return 0; } - return !require_fallback && (n->enumerators || n->object_manager); + return 0; } static int process_introspect( @@ -861,7 +904,7 @@ static int process_introspect( if (r < 0) return r; - r = introspect_write_default_interfaces(&intro, bus_node_with_object_manager(bus, n)); + r = introspect_write_default_interfaces(&intro, !require_fallback && n->object_managers); if (r < 0) return r; @@ -910,12 +953,12 @@ static int process_introspect( /* 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) + if (r <= 0) + goto finish; + if (bus->nodes_modified) { + r = 0; goto finish; + } } *found_object = true; @@ -1101,7 +1144,8 @@ static int process_get_managed_objects( _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; + Iterator i; + char *path; int r; assert(bus); @@ -1109,7 +1153,11 @@ static int process_get_managed_objects( assert(n); assert(found_object); - if (!bus_node_with_object_manager(bus, n)) + /* Spec says, GetManagedObjects() is only implemented on the root of a + * sub-tree. Therefore, we require a registered object-manager on + * exactly the queried path, otherwise, we refuse to respond. */ + + if (require_fallback || !n->object_managers) return 0; r = get_child_nodes(bus, m->path, n, &s, &error); @@ -1126,42 +1174,13 @@ static int process_get_managed_objects( if (r < 0) return r; - empty = set_isempty(s); - if (empty) { - struct node_vtable *c; - - /* Hmm, so we have no children? Then let's check - * whether we exist at all, i.e. whether at least one - * vtable exists. */ - - LIST_FOREACH(vtables, c, n->vtables) { - - if (require_fallback && !c->is_fallback) - continue; - - if (r < 0) - return r; - if (r == 0) - continue; - - empty = false; - break; - } + SET_FOREACH(path, s, i) { + r = object_manager_serialize_path_and_fallbacks(bus, reply, path, &error); + if (r < 0) + return r; - if (empty) + if (bus->nodes_modified) return 0; - } else { - Iterator i; - char *path; - - SET_FOREACH(path, s, i) { - r = object_manager_serialize_path_and_fallbacks(bus, reply, path, &error); - if (r < 0) - return r; - - if (bus->nodes_modified) - return 0; - } } r = sd_bus_message_close_container(reply); @@ -1289,6 +1308,8 @@ static int object_find_and_run( r = bus_node_exists(bus, n, m->path, require_fallback); if (r < 0) return r; + if (bus->nodes_modified) + return 0; if (r > 0) *found_object = true; } @@ -1379,7 +1400,7 @@ static struct node *bus_node_allocate(sd_bus *bus, const char *path) { if (n) return n; - r = hashmap_ensure_allocated(&bus->nodes, string_hash_func, string_compare_func); + r = hashmap_ensure_allocated(&bus->nodes, &string_hash_ops); if (r < 0) return NULL; @@ -1421,7 +1442,7 @@ static struct node *bus_node_allocate(sd_bus *bus, const char *path) { return n; } -static void bus_node_gc(sd_bus *b, struct node *n) { +void bus_node_gc(sd_bus *b, struct node *n) { assert(b); if (!n) @@ -1431,7 +1452,7 @@ static void bus_node_gc(sd_bus *b, struct node *n) { n->callbacks || n->vtables || n->enumerators || - n->object_manager) + n->object_managers) return; assert(hashmap_remove(b->nodes, n->path) == n); @@ -1446,12 +1467,13 @@ static void bus_node_gc(sd_bus *b, struct node *n) { static int bus_add_object( sd_bus *bus, + sd_bus_slot **slot, bool fallback, const char *path, sd_bus_message_handler_t callback, void *userdata) { - struct node_callback *c; + sd_bus_slot *s; struct node *n; int r; @@ -1464,136 +1486,49 @@ static int bus_add_object( if (!n) return -ENOMEM; - c = new0(struct node_callback, 1); - if (!c) { + s = bus_slot_allocate(bus, !slot, BUS_NODE_CALLBACK, sizeof(struct node_callback), userdata); + if (!s) { r = -ENOMEM; goto fail; } - c->node = n; - c->callback = callback; - c->userdata = userdata; - c->is_fallback = fallback; + s->node_callback.callback = callback; + s->node_callback.is_fallback = fallback; - LIST_PREPEND(callbacks, n->callbacks, c); + s->node_callback.node = n; + LIST_PREPEND(callbacks, n->callbacks, &s->node_callback); bus->nodes_modified = true; + if (slot) + *slot = s; + return 0; fail: - free(c); + sd_bus_slot_unref(s); bus_node_gc(bus, n); + return r; } -static int bus_remove_object( +_public_ int sd_bus_add_object( sd_bus *bus, - bool fallback, + sd_bus_slot **slot, const char *path, sd_bus_message_handler_t callback, void *userdata) { - struct node_callback *c; - struct node *n; - - 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) - return 0; - - LIST_FOREACH(callbacks, c, n->callbacks) - if (c->callback == callback && c->userdata == userdata && c->is_fallback == fallback) - break; - if (!c) - return 0; - - LIST_REMOVE(callbacks, n->callbacks, c); - free(c); - - bus_node_gc(bus, n); - bus->nodes_modified = true; - - return 1; -} - -_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); + return bus_add_object(bus, slot, false, path, callback, 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); -} - -_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); -} - -_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); -} - -static void free_node_vtable(sd_bus *bus, struct node_vtable *w) { - assert(bus); - - if (!w) - return; - - if (w->interface && w->node && w->vtable) { - const sd_bus_vtable *v; - - for (v = w->vtable; v->type != _SD_BUS_VTABLE_END; v++) { - struct vtable_member *x = NULL; - - switch (v->type) { - - case _SD_BUS_VTABLE_METHOD: { - struct vtable_member key; - - key.path = w->node->path; - key.interface = w->interface; - key.member = v->x.method.member; - - x = hashmap_remove(bus->vtable_methods, &key); - break; - } - - case _SD_BUS_VTABLE_PROPERTY: - case _SD_BUS_VTABLE_WRITABLE_PROPERTY: { - struct vtable_member key; - - key.path = w->node->path; - key.interface = w->interface; - key.member = v->x.property.member; - x = hashmap_remove(bus->vtable_properties, &key); - break; - }} - - free(x); - } - } +_public_ int sd_bus_add_fallback( + sd_bus *bus, + sd_bus_slot **slot, + const char *prefix, + sd_bus_message_handler_t callback, + void *userdata) { - free(w->interface); - free(w); + return bus_add_object(bus, slot, true, prefix, callback, userdata); } static unsigned long vtable_member_hash_func(const void *a, const uint8_t hash_key[HASH_KEY_SIZE]) { @@ -1635,8 +1570,14 @@ static int vtable_member_compare_func(const void *a, const void *b) { return strcmp(x->member, y->member); } +static const struct hash_ops vtable_member_hash_ops = { + .hash = vtable_member_hash_func, + .compare = vtable_member_compare_func +}; + static int add_object_vtable_internal( sd_bus *bus, + sd_bus_slot **slot, const char *path, const char *interface, const sd_bus_vtable *vtable, @@ -1644,7 +1585,8 @@ static int add_object_vtable_internal( sd_bus_object_find_t find, void *userdata) { - struct node_vtable *c = NULL, *i, *existing = NULL; + sd_bus_slot *s = NULL; + struct node_vtable *i, *existing = NULL; const sd_bus_vtable *v; struct node *n; int r; @@ -1661,11 +1603,11 @@ static int add_object_vtable_internal( !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); + r = hashmap_ensure_allocated(&bus->vtable_methods, &vtable_member_hash_ops); if (r < 0) return r; - r = hashmap_ensure_allocated(&bus->vtable_properties, vtable_member_hash_func, vtable_member_compare_func); + r = hashmap_ensure_allocated(&bus->vtable_properties, &vtable_member_hash_ops); if (r < 0) return r; @@ -1690,25 +1632,23 @@ static int add_object_vtable_internal( } } - c = new0(struct node_vtable, 1); - if (!c) { + s = bus_slot_allocate(bus, !slot, BUS_NODE_VTABLE, sizeof(struct node_vtable), userdata); + if (!s) { r = -ENOMEM; goto fail; } - c->node = n; - c->is_fallback = fallback; - c->vtable = vtable; - c->userdata = userdata; - c->find = find; + s->node_vtable.is_fallback = fallback; + s->node_vtable.vtable = vtable; + s->node_vtable.find = find; - c->interface = strdup(interface); - if (!c->interface) { + s->node_vtable.interface = strdup(interface); + if (!s->node_vtable.interface) { r = -ENOMEM; goto fail; } - for (v = c->vtable+1; v->type != _SD_BUS_VTABLE_END; v++) { + for (v = s->node_vtable.vtable+1; v->type != _SD_BUS_VTABLE_END; v++) { switch (v->type) { @@ -1730,9 +1670,9 @@ static int add_object_vtable_internal( goto fail; } - m->parent = c; + m->parent = &s->node_vtable; m->path = n->path; - m->interface = c->interface; + m->interface = s->node_vtable.interface; m->member = v->x.method.member; m->vtable = v; @@ -1752,6 +1692,11 @@ static int add_object_vtable_internal( goto fail; } + if (v->flags & SD_BUS_VTABLE_PROPERTY_CONST) { + r = -EINVAL; + goto fail; + } + /* Fall through */ case _SD_BUS_VTABLE_PROPERTY: { @@ -1773,9 +1718,9 @@ static int add_object_vtable_internal( goto fail; } - m->parent = c; + m->parent = &s->node_vtable; m->path = n->path; - m->interface = c->interface; + m->interface = s->node_vtable.interface; m->member = v->x.property.member; m->vtable = v; @@ -1805,110 +1750,53 @@ static int add_object_vtable_internal( } } - LIST_INSERT_AFTER(vtables, n->vtables, existing, c); + s->node_vtable.node = n; + LIST_INSERT_AFTER(vtables, n->vtables, existing, &s->node_vtable); bus->nodes_modified = true; + if (slot) + *slot = s; + return 0; fail: - if (c) - free_node_vtable(bus, c); - + sd_bus_slot_unref(s); bus_node_gc(bus, n); - return r; -} -static int remove_object_vtable_internal( - sd_bus *bus, - const char *path, - const char *interface, - const sd_bus_vtable *vtable, - bool fallback, - sd_bus_object_find_t find, - void *userdata) { - - struct node_vtable *c; - struct node *n; - - 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 && - c->vtable == vtable && - c->find == find && - c->userdata == userdata) - break; - - if (!c) - return 0; - - LIST_REMOVE(vtables, n->vtables, c); - - free_node_vtable(bus, c); - bus_node_gc(bus, n); - - bus->nodes_modified = true; - - return 1; + return r; } _public_ int sd_bus_add_object_vtable( sd_bus *bus, + sd_bus_slot **slot, const char *path, const char *interface, const sd_bus_vtable *vtable, void *userdata) { - return add_object_vtable_internal(bus, path, interface, vtable, false, NULL, userdata); -} - -_public_ int sd_bus_remove_object_vtable( - sd_bus *bus, - const char *path, - const char *interface, - const sd_bus_vtable *vtable, - void *userdata) { - - return remove_object_vtable_internal(bus, path, interface, vtable, false, NULL, userdata); + return add_object_vtable_internal(bus, slot, path, interface, vtable, false, NULL, userdata); } _public_ int sd_bus_add_fallback_vtable( sd_bus *bus, - const char *path, - const char *interface, - const sd_bus_vtable *vtable, - sd_bus_object_find_t find, - void *userdata) { - - return add_object_vtable_internal(bus, path, interface, vtable, true, find, userdata); -} - -_public_ int sd_bus_remove_fallback_vtable( - sd_bus *bus, - const char *path, + sd_bus_slot **slot, + const char *prefix, const char *interface, const sd_bus_vtable *vtable, sd_bus_object_find_t find, void *userdata) { - return remove_object_vtable_internal(bus, path, interface, vtable, true, find, userdata); + return add_object_vtable_internal(bus, slot, prefix, interface, vtable, true, find, userdata); } _public_ int sd_bus_add_node_enumerator( sd_bus *bus, + sd_bus_slot **slot, const char *path, sd_bus_node_enumerator_t callback, void *userdata) { - struct node_enumerator *c; + sd_bus_slot *s; struct node *n; int r; @@ -1921,61 +1809,28 @@ _public_ int sd_bus_add_node_enumerator( if (!n) return -ENOMEM; - c = new0(struct node_enumerator, 1); - if (!c) { + s = bus_slot_allocate(bus, !slot, BUS_NODE_ENUMERATOR, sizeof(struct node_enumerator), userdata); + if (!s) { r = -ENOMEM; goto fail; } - c->node = n; - c->callback = callback; - c->userdata = userdata; - - LIST_PREPEND(enumerators, n->enumerators, c); + s->node_enumerator.callback = callback; + s->node_enumerator.node = n; + LIST_PREPEND(enumerators, n->enumerators, &s->node_enumerator); bus->nodes_modified = true; + if (slot) + *slot = s; + return 0; fail: - free(c); - bus_node_gc(bus, n); - return r; -} - -_public_ int sd_bus_remove_node_enumerator( - sd_bus *bus, - const char *path, - sd_bus_node_enumerator_t callback, - void *userdata) { - - struct node_enumerator *c; - struct node *n; - - 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) - return 0; - - LIST_FOREACH(enumerators, c, n->enumerators) - if (c->callback == callback && c->userdata == userdata) - break; - - if (!c) - return 0; - - LIST_REMOVE(enumerators, n->enumerators, c); - free(c); - + sd_bus_slot_unref(s); bus_node_gc(bus, n); - bus->nodes_modified = true; - - return 1; + return r; } static int emit_properties_changed_on_interface( @@ -2199,9 +2054,10 @@ _public_ int sd_bus_emit_properties_changed_strv( 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 (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; /* A non-NULL but empty names list means nothing needs to be generated. A NULL list OTOH indicates that all properties @@ -2244,9 +2100,11 @@ _public_ int sd_bus_emit_properties_changed( 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 (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + if (!name) return 0; @@ -2364,17 +2222,17 @@ _public_ int sd_bus_emit_interfaces_added_strv(sd_bus *bus, const char *path, ch 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 (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + if (strv_isempty(interfaces)) return 0; do { bus->nodes_modified = false; - - if (m) - m = sd_bus_message_unref(m); + m = sd_bus_message_unref(m); r = sd_bus_message_new_signal(bus, &m, path, "org.freedesktop.DBus.ObjectManager", "InterfacesAdded"); if (r < 0) @@ -2424,9 +2282,11 @@ _public_ int sd_bus_emit_interfaces_added(sd_bus *bus, const char *path, const c 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 (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + interfaces = strv_from_stdarg_alloca(interface); return sd_bus_emit_interfaces_added_strv(bus, path, interfaces); @@ -2438,9 +2298,11 @@ _public_ int sd_bus_emit_interfaces_removed_strv(sd_bus *bus, const char *path, 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 (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + if (strv_isempty(interfaces)) return 0; @@ -2464,16 +2326,20 @@ _public_ int sd_bus_emit_interfaces_removed(sd_bus *bus, const char *path, const 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 (!BUS_IS_OPEN(bus->state)) + return -ENOTCONN; + interfaces = strv_from_stdarg_alloca(interface); return sd_bus_emit_interfaces_removed_strv(bus, path, interfaces); } -_public_ int sd_bus_add_object_manager(sd_bus *bus, const char *path) { +_public_ int sd_bus_add_object_manager(sd_bus *bus, sd_bus_slot **slot, const char *path) { + sd_bus_slot *s; struct node *n; + int r; assert_return(bus, -EINVAL); assert_return(object_path_is_valid(path), -EINVAL); @@ -2483,28 +2349,24 @@ _public_ int sd_bus_add_object_manager(sd_bus *bus, const char *path) { if (!n) return -ENOMEM; - n->object_manager = true; - bus->nodes_modified = true; - return 0; -} - -_public_ int sd_bus_remove_object_manager(sd_bus *bus, const char *path) { - struct node *n; + s = bus_slot_allocate(bus, !slot, BUS_NODE_OBJECT_MANAGER, sizeof(struct node_object_manager), NULL); + if (!s) { + r = -ENOMEM; + goto fail; + } - assert_return(bus, -EINVAL); - assert_return(object_path_is_valid(path), -EINVAL); - assert_return(!bus_pid_changed(bus), -ECHILD); + s->node_object_manager.node = n; + LIST_PREPEND(object_managers, n->object_managers, &s->node_object_manager); + bus->nodes_modified = true; - n = hashmap_get(bus->nodes, path); - if (!n) - return 0; + if (slot) + *slot = s; - if (!n->object_manager) - return 0; + return 0; - n->object_manager = false; - bus->nodes_modified = true; +fail: + sd_bus_slot_unref(s); bus_node_gc(bus, n); - return 1; + return r; }