X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbusctl.c;h=d5ac2fe0f2a81ba8f4285a11c5a9eb64cd55755f;hb=7b0b392f7bce4bb1b17fec54d1baf27daa85777f;hp=cb7d258f5a7cbf1091016ebf2680f6cac2d3deba;hpb=c430fee6ffda0e3736e4e2b617bef0a4c0882849;p=elogind.git

diff --git a/src/libsystemd-bus/busctl.c b/src/libsystemd-bus/busctl.c
index cb7d258f5..d5ac2fe0f 100644
--- a/src/libsystemd-bus/busctl.c
+++ b/src/libsystemd-bus/busctl.c
@@ -34,9 +34,11 @@
 
 static bool arg_no_pager = false;
 static char *arg_address = NULL;
-static bool arg_user = false;
 static bool arg_no_unique = false;
 static char **arg_matches = NULL;
+static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
+static char *arg_host = NULL;
+static bool arg_user = false;
 
 static void pager_open_if_enabled(void) {
 
@@ -68,11 +70,12 @@ static int list_bus_names(sd_bus *bus, char **argv) {
         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;
 
@@ -109,8 +112,15 @@ static int list_bus_names(sd_bus *bus, char **argv) {
 
                 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");
         }
 
@@ -179,17 +189,19 @@ static int help(void) {
 
         printf("%s [OPTIONS...] {COMMAND} ...\n\n"
                "Introspect the bus.\n\n"
-               "  -h --help              Show this help\n"
-               "     --version           Show package version\n"
-               "     --system            Connect to system bus\n"
-               "     --user              Connect to user bus\n"
-               "     --address=ADDRESS   Connect to bus specified by address\n"
-               "     --no-unique         Only show well-known names\n"
-               "     --match=MATCH       Only show matching messages\n"
-               "     --no-pager          Do not pipe output into a pager\n\n"
+               "  -h --help               Show this help\n"
+               "     --version            Show package version\n"
+               "     --no-pager           Do not pipe output into a pager\n"
+               "     --system             Connect to system bus\n"
+               "     --user               Connect to user bus\n"
+               "  -H --host=[USER@]HOST   Operate on remote host\n"
+               "  -M --machine=CONTAINER  Operate on local container\n"
+               "     --address=ADDRESS    Connect to bus specified by address\n"
+               "     --no-unique          Only show well-known names\n"
+               "     --match=MATCH        Only show matching messages\n\n"
                "Commands:\n"
-               "  list                   List bus names\n"
-               "  monitor [SERVICE...]   Show bus traffic\n",
+               "  list                    List bus names\n"
+               "  monitor [SERVICE...]    Show bus traffic\n",
                program_invocation_short_name);
 
         return 0;
@@ -216,7 +228,9 @@ static int parse_argv(int argc, char *argv[]) {
                 { "address",   required_argument, NULL, ARG_ADDRESS   },
                 { "no-unique", no_argument,       NULL, ARG_NO_UNIQUE },
                 { "match",     required_argument, NULL, ARG_MATCH     },
-                { NULL,        0,                 NULL, 0             },
+                { "host",      required_argument, NULL, 'H'           },
+                { "machine",   required_argument, NULL, 'M'           },
+                {},
         };
 
         int c;
@@ -224,7 +238,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "hH:M:", options, NULL)) >= 0) {
 
                 switch (c) {
 
@@ -261,12 +275,21 @@ static int parse_argv(int argc, char *argv[]) {
                                 return log_oom();
                         break;
 
+                case 'H':
+                        arg_transport = BUS_TRANSPORT_REMOTE;
+                        arg_host = optarg;
+                        break;
+
+                case 'M':
+                        arg_transport = BUS_TRANSPORT_CONTAINER;
+                        arg_host = optarg;
+                        break;
+
                 case '?':
                         return -EINVAL;
 
                 default:
-                        log_error("Unknown option code %c", c);
-                        return -EINVAL;
+                        assert_not_reached("Unhandled option");
                 }
         }
 
@@ -321,10 +344,8 @@ int main(int argc, char *argv[]) {
                 }
 
                 r = sd_bus_start(bus);
-        } else if (arg_user)
-                r = sd_bus_open_user(&bus);
-        else
-                r = sd_bus_open_system(&bus);
+        } else
+                r = bus_open_transport(arg_transport, arg_host, arg_user, &bus);
 
         if (r < 0) {
                 log_error("Failed to connect to bus: %s", strerror(-r));
@@ -335,6 +356,7 @@ int main(int argc, char *argv[]) {
 
 finish:
         pager_close();
+
         strv_free(arg_matches);
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;