#include "bus-message.h"
#include "bus-internal.h"
#include "bus-util.h"
+#include "bus-dump.h"
static bool arg_no_pager = false;
static char *arg_address = NULL;
STRV_FOREACH(i, l)
max_i = MAX(max_i, strlen(*i));
- printf("%-*s %*s %-*s %-*s CONNECTION\n",
- (int) max_i, "NAME", 10, "PID", 15, "PROCESS", 16, "USER");
+ printf("%-*s %*s %-*s %-*s %-*s MACHINE\n",
+ (int) max_i, "NAME", 10, "PID", 15, "PROCESS", 16, "USER", 20, "CONNECTION");
STRV_FOREACH(i, l) {
_cleanup_free_ char *owner = NULL;
+ sd_id128_t mid;
pid_t pid;
uid_t uid;
r = sd_bus_get_owner(bus, *i, &owner);
if (r >= 0)
- printf(" %s\n", owner);
+ printf(" %-20s", owner);
else
+ printf(" - ");
+
+ r = sd_bus_get_owner_machine_id(bus, *i, &mid);
+ if (r >= 0) {
+ char m[SD_ID128_STRING_MAX];
+ printf(" %s\n", sd_id128_to_string(mid, m));
+ } else
printf(" -\n");
}
}
static int monitor(sd_bus *bus, char *argv[]) {
+ bool added_something = false;
char **i;
int r;
log_error("Failed to add match: %s", strerror(-r));
return r;
}
+
+ added_something = true;
}
STRV_FOREACH(i, arg_matches) {
log_error("Failed to add match: %s", strerror(-r));
return r;
}
+
+ added_something = true;
+ }
+
+ if (!added_something) {
+ r = sd_bus_add_match(bus, "", NULL, NULL);
+ if (r < 0) {
+ log_error("Failed to add match: %s", strerror(-r));
+ return r;
+ }
}
for (;;) {
{ "address", required_argument, NULL, ARG_ADDRESS },
{ "no-unique", no_argument, NULL, ARG_NO_UNIQUE },
{ "match", required_argument, NULL, ARG_MATCH },
+ { "host", required_argument, NULL, 'H' },
+ { "machine", required_argument, NULL, 'M' },
{},
};