}
static int list_bus_names(sd_bus *bus, char **argv) {
- _cleanup_strv_free_ char **l = NULL;
+ _cleanup_strv_free_ char **acquired = NULL, **activatable = NULL;
char **i;
int r;
size_t max_i = 0;
assert(bus);
- r = sd_bus_list_names(bus, &l);
+ r = sd_bus_list_names(bus, &acquired, &activatable);
if (r < 0) {
log_error("Failed to list names: %s", strerror(-r));
return r;
pager_open_if_enabled();
- strv_sort(l);
+ strv_sort(acquired);
+ strv_sort(activatable);
- STRV_FOREACH(i, l)
+ STRV_FOREACH(i, acquired)
+ max_i = MAX(max_i, strlen(*i));
+
+ STRV_FOREACH(i, activatable)
max_i = MAX(max_i, strlen(*i));
printf("%-*s %*s %-*s %-*s %-*s",
else
putchar('\n');
- STRV_FOREACH(i, l) {
+ STRV_FOREACH(i, activatable) {
+
+ /* Skip the bus driver */
+ if (streq(*i, "org.freedesktop.DBus"))
+ continue;
+
+ if (strv_contains(acquired, *i))
+ continue;
+
+ printf("%-*s", (int) max_i, *i);
+ printf(" - - - (activation) ");
+ if (arg_no_machine)
+ putchar('\n');
+ else
+ puts(" -");
+ }
+
+ STRV_FOREACH(i, acquired) {
_cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
- _cleanup_free_ char *owner = NULL;
sd_id128_t mid;
if (arg_no_unique && (*i)[0] == ':')
continue;
- /* Skip the bus driver */
- if (streq(*i, "org.freedesktop.DBus"))
- continue;
-
printf("%-*s", (int) max_i, *i);
- r = sd_bus_get_owner(bus, *i, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_COMM, &owner, &creds);
+ r = sd_bus_get_owner(bus, *i, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_COMM|SD_BUS_CREDS_UNIQUE_NAME, &creds);
if (r >= 0) {
+ const char *unique;
pid_t pid;
uid_t uid;
} else
fputs(" - ", stdout);
- if (owner)
- printf(" %-20s", owner);
+ r = sd_bus_creds_get_unique_name(creds, &unique);
+ if (r >= 0)
+ printf(" %-20s", unique);
else
fputs(" - ", stdout);
return r;
}
}
+}
- return -EINVAL;
+static int status(sd_bus *bus, char *argv[]) {
+ _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
+ pid_t pid;
+ int r;
+
+ assert(bus);
+
+ if (strv_length(argv) != 2) {
+ log_error("Expects one argument.");
+ return -EINVAL;
+ }
+
+ r = parse_pid(argv[1], &pid);
+ if (r < 0)
+ r = sd_bus_get_owner(bus, argv[1], _SD_BUS_CREDS_ALL, &creds);
+ else
+ r = sd_bus_creds_new_from_pid(pid, _SD_BUS_CREDS_ALL, &creds);
+
+ if (r < 0) {
+ log_error("Failed to get credentials: %s", strerror(-r));
+ return r;
+ }
+
+ bus_creds_dump(creds, NULL);
+ return 0;
}
static int help(void) {
" --match=MATCH Only show matching messages\n\n"
"Commands:\n"
" list List bus names\n"
- " monitor [SERVICE...] Show bus traffic\n",
+ " monitor [SERVICE...] Show bus traffic\n"
+ " status ENDPOINT Show endpoint status\n"
+ " help Show this help\n",
program_invocation_short_name);
return 0;
if (streq(argv[optind], "monitor"))
return monitor(bus, argv + optind);
+ if (streq(argv[optind], "status"))
+ return status(bus, argv + optind);
+
if (streq(argv[optind], "help"))
return help();