From 0ddf50ffcbd5ed4d406264c23c23df4e76bc253c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 17 Apr 2018 23:37:52 +0900 Subject: [PATCH 1/3] bus-util: introduce bus_open_system_watch_bind_with_description() Similar to 56fbd7187a5af44a90c258fbeb1f17114f226bb3, this adds bus_open_system_watch_bind_with_description() to set description for busses. --- src/shared/bus-util.c | 8 +++++++- src/shared/bus-util.h | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 10f047026e..a14e87d1ba 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -1657,7 +1657,7 @@ int bus_track_add_name_many(sd_bus_track *t, char **l) { return r; } -int bus_open_system_watch_bind(sd_bus **ret) { +int bus_open_system_watch_bind_with_description(sd_bus **ret, const char *description) { _cleanup_(sd_bus_unrefp) sd_bus *bus = NULL; const char *e; int r; @@ -1670,6 +1670,12 @@ int bus_open_system_watch_bind(sd_bus **ret) { if (r < 0) return r; + if (description) { + r = sd_bus_set_description(bus, description); + if (r < 0) + return r; + } + e = secure_getenv("DBUS_SYSTEM_BUS_ADDRESS"); if (!e) e = DEFAULT_SYSTEM_BUS_ADDRESS; diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h index 668c7cc982..d03d0f82d9 100644 --- a/src/shared/bus-util.h +++ b/src/shared/bus-util.h @@ -159,4 +159,7 @@ int bus_property_get_rlimit(sd_bus *bus, const char *path, const char *interface int bus_track_add_name_many(sd_bus_track *t, char **l); -int bus_open_system_watch_bind(sd_bus **ret); +int bus_open_system_watch_bind_with_description(sd_bus **ret, const char *description); +static inline int bus_open_system_watch_bind(sd_bus **ret) { + return bus_open_system_watch_bind_with_description(ret, NULL); +} From 621e450980e62961a81c9fe4ce0561e2ea4ddea0 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 17 Apr 2018 23:55:27 +0900 Subject: [PATCH 2/3] network: set description to bus --- src/network/networkd-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 80d27c06b3..0d85ba6e72 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -131,7 +131,7 @@ int manager_connect_bus(Manager *m) { if (m->bus) return 0; - r = bus_open_system_watch_bind(&m->bus); + r = bus_open_system_watch_bind_with_description(&m->bus, "bus-api-network"); if (r < 0) return log_error_errno(r, "Failed to connect to bus: %m"); From 8c6afb7763919f69516c108bcbc27cc89a5c371c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 17 Apr 2018 23:56:17 +0900 Subject: [PATCH 3/3] resolve: set description to bus --- src/resolve/resolved-bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index 3845eafaa3..fda43b84cf 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -1883,7 +1883,7 @@ int manager_connect_bus(Manager *m) { if (m->bus) return 0; - r = bus_open_system_watch_bind(&m->bus); + r = bus_open_system_watch_bind_with_description(&m->bus, "bus-api-resolve"); if (r < 0) return log_error_errno(r, "Failed to connect to system bus: %m");