summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-11-28 16:38:47 +0100
committerLennart Poettering <lennart@poettering.net>2014-11-28 20:29:43 +0100
commit5c3026927de9dfa60ad6ae8326fef5d7824e723e (patch)
tree6e31a4fea775b3eb5f1afa5cfe484cef97fc9820
parent4a62c710b62a5a3c7a8a278b810b9d5b5a0c8f4f (diff)
sd-bus: rename sd_bus_get_owner_id() → sd_bus_get_bus_id()
The ID returned really doesn't identify the owner, but the bus instance, hence fix this misnaming. Also, update "busctl status" to show the ID in its output.
-rw-r--r--src/bus-proxyd/bus-proxyd.c4
-rw-r--r--src/libsystemd/libsystemd.sym.m42
-rw-r--r--src/libsystemd/sd-bus/busctl.c5
-rw-r--r--src/libsystemd/sd-bus/sd-bus.c2
-rw-r--r--src/libsystemd/sd-bus/test-bus-chat.c2
-rw-r--r--src/systemd/sd-bus.h2
6 files changed, 11 insertions, 6 deletions
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 6b15e7d27b..6dfba14695 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -625,7 +625,7 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, Policy *polic
if (!sd_bus_message_has_signature(m, ""))
return synthetic_reply_method_error(m, &SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_INVALID_ARGS, "Invalid parameters"));
- r = sd_bus_get_owner_id(a, &server_id);
+ r = sd_bus_get_bus_id(a, &server_id);
if (r < 0)
return synthetic_reply_method_errno(m, r, NULL);
@@ -1354,7 +1354,7 @@ int main(int argc, char *argv[]) {
goto finish;
}
- r = sd_bus_get_owner_id(a, &server_id);
+ r = sd_bus_get_bus_id(a, &server_id);
if (r < 0) {
log_error_errno(r, "Failed to get server ID: %m");
goto finish;
diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym.m4
index 7632942564..baa1a6f585 100644
--- a/src/libsystemd/libsystemd.sym.m4
+++ b/src/libsystemd/libsystemd.sym.m4
@@ -190,7 +190,7 @@ global:
sd_bus_unref;
sd_bus_is_open;
sd_bus_can_send;
- sd_bus_get_owner_id;
+ sd_bus_get_bus_id;
sd_bus_get_owner_creds;
sd_bus_get_description;
sd_bus_send;
diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c
index 229a1cf9a2..f75a9dcbd3 100644
--- a/src/libsystemd/sd-bus/busctl.c
+++ b/src/libsystemd/sd-bus/busctl.c
@@ -1177,11 +1177,16 @@ static int status(sd_bus *bus, char *argv[]) {
_SD_BUS_CREDS_ALL);
} else {
const char *scope;
+ sd_id128_t bus_id;
r = sd_bus_get_scope(bus, &scope);
if (r >= 0)
printf("Scope=%s%s%s\n", ansi_highlight(), scope, ansi_highlight_off());
+ r = sd_bus_get_bus_id(bus, &bus_id);
+ if (r >= 0)
+ printf("BusID=%s" SD_ID128_FORMAT_STR "%s\n", ansi_highlight(), SD_ID128_FORMAT_VAL(bus_id), ansi_highlight_off());
+
r = sd_bus_get_owner_creds(
bus,
(arg_augment_creds ? SD_BUS_CREDS_AUGMENT : 0) | _SD_BUS_CREDS_ALL,
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 70dabccf5d..5947cd72c9 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -1442,7 +1442,7 @@ _public_ int sd_bus_can_send(sd_bus *bus, char type) {
return bus_type_is_valid(type);
}
-_public_ int sd_bus_get_owner_id(sd_bus *bus, sd_id128_t *id) {
+_public_ int sd_bus_get_bus_id(sd_bus *bus, sd_id128_t *id) {
int r;
assert_return(bus, -EINVAL);
diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index 4a025d69ea..06edd621e4 100644
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -76,7 +76,7 @@ static int server_init(sd_bus **_bus) {
goto fail;
}
- r = sd_bus_get_owner_id(bus, &id);
+ r = sd_bus_get_bus_id(bus, &id);
if (r < 0) {
log_error_errno(r, "Failed to get server ID: %m");
goto fail;
diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index b245833672..78a81a9436 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -138,7 +138,7 @@ sd_bus *sd_bus_unref(sd_bus *bus);
int sd_bus_is_open(sd_bus *bus);
int sd_bus_can_send(sd_bus *bus, char type);
-int sd_bus_get_owner_id(sd_bus *bus, sd_id128_t *id);
+int sd_bus_get_bus_id(sd_bus *bus, sd_id128_t *id);
int sd_bus_get_owner_creds(sd_bus *bus, uint64_t creds_mask, sd_bus_creds **ret);
int sd_bus_get_scope(sd_bus *bus, const char **scope);
int sd_bus_get_description(sd_bus *bus, const char **description);