X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-control.c;h=f217269f79d29117fe5453df96a11b46ac26a952;hp=ae0d7f97674bfc3de9b3fd1e1d61fc0edf87f115;hb=0cc1125ae10a216f2b27cb2828849ac1beb6a1b1;hpb=c78196699d3d805b2237896a1d2b8efeec6068d0 diff --git a/src/libsystemd-bus/bus-control.c b/src/libsystemd-bus/bus-control.c index ae0d7f976..f217269f7 100644 --- a/src/libsystemd-bus/bus-control.c +++ b/src/libsystemd-bus/bus-control.c @@ -33,8 +33,9 @@ #include "bus-message.h" #include "bus-control.h" #include "bus-bloom.h" +#include "bus-util.h" -int sd_bus_get_unique_name(sd_bus *bus, const char **unique) { +_public_ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) { int r; if (!bus) @@ -52,7 +53,7 @@ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) { return 0; } -int sd_bus_request_name(sd_bus *bus, const char *name, int flags) { +_public_ int sd_bus_request_name(sd_bus *bus, const char *name, int flags) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; uint32_t ret; int r; @@ -75,7 +76,7 @@ int sd_bus_request_name(sd_bus *bus, const char *name, int flags) { l = strlen(name); n = alloca0(offsetof(struct kdbus_cmd_name, name) + l + 1); n->size = offsetof(struct kdbus_cmd_name, name) + l + 1; - n->name_flags = flags; + n->flags = flags; memcpy(n->name, name, l+1); #ifdef HAVE_VALGRIND_MEMCHECK_H @@ -86,7 +87,7 @@ int sd_bus_request_name(sd_bus *bus, const char *name, int flags) { if (r < 0) return -errno; - return n->name_flags; + return n->flags; } else { r = sd_bus_call_method( bus, @@ -110,7 +111,7 @@ int sd_bus_request_name(sd_bus *bus, const char *name, int flags) { } } -int sd_bus_release_name(sd_bus *bus, const char *name) { +_public_ int sd_bus_release_name(sd_bus *bus, const char *name) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; uint32_t ret; int r; @@ -142,7 +143,7 @@ int sd_bus_release_name(sd_bus *bus, const char *name) { if (r < 0) return -errno; - return n->name_flags; + return n->flags; } else { r = sd_bus_call_method( bus, @@ -165,7 +166,7 @@ int sd_bus_release_name(sd_bus *bus, const char *name) { return ret; } -int sd_bus_list_names(sd_bus *bus, char ***l) { +_public_ int sd_bus_list_names(sd_bus *bus, char ***l) { _cleanup_bus_message_unref_ sd_bus_message *reply1 = NULL, *reply2 = NULL; char **x = NULL; int r; @@ -219,19 +220,15 @@ int sd_bus_list_names(sd_bus *bus, char ***l) { return 0; } -int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner) { +_public_ int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; const char *found; int r; - if (!bus) - return -EINVAL; - if (!name) - return -EINVAL; - if (!BUS_IS_OPEN(bus->state)) - return -ENOTCONN; - if (bus_pid_changed(bus)) - return -ECHILD; + assert_return(bus, -EINVAL); + assert_return(name, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(!bus_pid_changed(bus), -ECHILD); r = sd_bus_call_method( bus, @@ -263,7 +260,7 @@ int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner) { return 0; } -int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid) { +_public_ int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; uint32_t u; int r; @@ -300,7 +297,7 @@ int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid) { return 0; } -int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid) { +_public_ int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; uint32_t u; int r; @@ -385,12 +382,9 @@ int bus_add_match_internal( break; - case BUS_MATCH_DESTINATION: - /* The bloom filter does not include - the destination, since it is only - available for broadcast messages - which do not carry a destination - since they are undirected. */ + case BUS_MATCH_MESSAGE_TYPE: + bloom_add_pair(bloom, "message-type", bus_message_type_to_string(c->value_u8)); + using_bloom = true; break; case BUS_MATCH_INTERFACE: @@ -409,15 +403,45 @@ int bus_add_match_internal( break; case BUS_MATCH_PATH_NAMESPACE: - bloom_add_pair(bloom, "path-slash-prefix", c->value_str); + if (!streq(c->value_str, "/")) { + bloom_add_pair(bloom, "path-slash-prefix", c->value_str); + using_bloom = true; + } + break; + + case BUS_MATCH_ARG...BUS_MATCH_ARG_LAST: { + char buf[sizeof("arg")-1 + 2 + 1]; + + snprintf(buf, sizeof(buf), "arg%u", c->type - BUS_MATCH_ARG); + bloom_add_pair(bloom, buf, c->value_str); using_bloom = true; break; + } - case BUS_MATCH_ARG...BUS_MATCH_ARG_LAST: - case BUS_MATCH_ARG_PATH...BUS_MATCH_ARG_PATH_LAST: - case BUS_MATCH_ARG_NAMESPACE...BUS_MATCH_ARG_NAMESPACE_LAST: - case BUS_MATCH_MESSAGE_TYPE: - assert_not_reached("FIXME!"); + case BUS_MATCH_ARG_PATH...BUS_MATCH_ARG_PATH_LAST: { + char buf[sizeof("arg")-1 + 2 + sizeof("-slash-prefix")]; + + snprintf(buf, sizeof(buf), "arg%u-slash-prefix", c->type - BUS_MATCH_ARG_PATH); + bloom_add_pair(bloom, buf, c->value_str); + using_bloom = true; + break; + } + + case BUS_MATCH_ARG_NAMESPACE...BUS_MATCH_ARG_NAMESPACE_LAST: { + char buf[sizeof("arg")-1 + 2 + sizeof("-dot-prefix")]; + + snprintf(buf, sizeof(buf), "arg%u-dot-prefix", c->type - BUS_MATCH_ARG_NAMESPACE); + bloom_add_pair(bloom, buf, c->value_str); + using_bloom = true; + break; + } + + case BUS_MATCH_DESTINATION: + /* The bloom filter does not include + the destination, since it is only + available for broadcast messages + which do not carry a destination + since they are undirected. */ break; case BUS_MATCH_ROOT: @@ -510,32 +534,34 @@ int bus_remove_match_internal( return 0; } -int sd_bus_get_owner_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine) { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; +_public_ int sd_bus_get_owner_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine) { + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL, *m = NULL; const char *mid; int r; - if (!bus) - return -EINVAL; - if (!name) - return -EINVAL; - if (!BUS_IS_OPEN(bus->state)) - return -ENOTCONN; - if (bus_pid_changed(bus)) - return -ECHILD; + assert_return(bus, -EINVAL); + assert_return(name, -EINVAL); + assert_return(machine, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(!bus_pid_changed(bus), -ECHILD); if (streq_ptr(name, bus->unique_name)) return sd_id128_get_machine(machine); - r = sd_bus_call_method(bus, - name, - "/", - "org.freedesktop.DBus.Peer", - "GetMachineId", - NULL, - &reply, - NULL); + r = sd_bus_message_new_method_call( + bus, + name, + "/", + "org.freedesktop.DBus.Peer", + "GetMachineId", &m); + if (r < 0) + return r; + + r = sd_bus_message_set_no_auto_start(m, true); + if (r < 0) + return r; + r = sd_bus_call(bus, m, 0, NULL, &reply); if (r < 0) return r;