along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <sys/socket.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
#include <getopt.h>
#include <pwd.h>
#include <locale.h>
-#include <socket.h>
#include <fcntl.h>
#include "sd-bus.h"
return r;
}
- if (on_tty())
- printf("%-32s %-9s %-16s\n", "MACHINE", "CONTAINER", "SERVICE");
+ printf("%-32s %-9s %-16s\n", "MACHINE", "CONTAINER", "SERVICE");
r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssso)");
if (r < 0)
- goto fail;
+ return bus_log_parse_error(r);
while ((r = sd_bus_message_read(reply, "(ssso)", &name, &class, &service, &object)) > 0) {
printf("%-32s %-9s %-16s\n", name, class, service);
k++;
}
if (r < 0)
- goto fail;
+ return bus_log_parse_error(r);
r = sd_bus_message_exit_container(reply);
if (r < 0)
- goto fail;
+ return bus_log_parse_error(r);
- if (on_tty())
- printf("\n%u machines listed.\n", k);
+ printf("\n%u machines listed.\n", k);
return 0;
-
-fail:
- log_error("Failed to parse reply: %s", strerror(-r));
- return r;
}
static int show_scope_cgroup(sd_bus *bus, const char *unit, pid_t leader) {
}
r = sd_bus_message_read(reply, "s", &cgroup);
- if (r < 0) {
- log_error("Failed to parse reply: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return bus_log_parse_error(r);
if (isempty(cgroup))
return 0;
}
typedef struct MachineStatusInfo {
- const char *name;
+ char *name;
sd_id128_t id;
- const char *class;
- const char *service;
- const char *scope;
- const char *root_directory;
+ char *class;
+ char *service;
+ char *scope;
+ char *root_directory;
pid_t leader;
usec_t timestamp;
} MachineStatusInfo;
}
}
-static int status_property_machine(const char *name, sd_bus_message *property, MachineStatusInfo *i) {
- char type;
- const char *contents;
- int r;
-
- assert(name);
- assert(property);
- assert(i);
-
- r = sd_bus_message_peek_type(property, &type, &contents);
- if (r < 0) {
- log_error("Could not determine type of message: %s", strerror(-r));
- return r;
- }
-
- switch (type) {
-
- case SD_BUS_TYPE_STRING: {
- const char *s;
-
- sd_bus_message_read_basic(property, type, &s);
-
- if (!isempty(s)) {
- if (streq(name, "Name"))
- i->name = s;
- else if (streq(name, "Class"))
- i->class = s;
- else if (streq(name, "Service"))
- i->service = s;
- else if (streq(name, "Scope"))
- i->scope = s;
- else if (streq(name, "RootDirectory"))
- i->root_directory = s;
- }
- break;
- }
-
- case SD_BUS_TYPE_UINT32: {
- uint32_t u;
-
- sd_bus_message_read_basic(property, type, &u);
-
- if (streq(name, "Leader"))
- i->leader = (pid_t) u;
-
- break;
- }
-
- case SD_BUS_TYPE_UINT64: {
- uint64_t u;
-
- sd_bus_message_read_basic(property, type, &u);
-
- if (streq(name, "Timestamp"))
- i->timestamp = (usec_t) u;
-
- break;
- }
-
- case SD_BUS_TYPE_ARRAY: {
- if (streq(contents, "y") && streq(name, "Id")) {
- const void *v;
- size_t n;
-
- sd_bus_message_read_array(property, SD_BUS_TYPE_BYTE, &v, &n);
- if (n == 0)
- i->id = SD_ID128_NULL;
- else if (n == 16)
- memcpy(&i->id, v, n);
- }
-
- break;
- }
- }
-
- return 0;
-}
-
-static int print_property(const char *name, sd_bus_message *reply) {
- assert(name);
- assert(reply);
-
- if (arg_property && !strv_find(arg_property, name))
- return 0;
-
- if (bus_generic_print_property(name, reply, arg_all) > 0)
- return 0;
-
- if (arg_all)
- printf("%s=[unprintable]\n", name);
-
- return 0;
-}
+static int show_info(const char *verb, sd_bus *bus, const char *path, bool *new_line) {
+
+ static const struct bus_properties_map map[] = {
+ { "Name", "s", NULL, offsetof(MachineStatusInfo, name) },
+ { "Class", "s", NULL, offsetof(MachineStatusInfo, class) },
+ { "Service", "s", NULL, offsetof(MachineStatusInfo, service) },
+ { "Scope", "s", NULL, offsetof(MachineStatusInfo, scope) },
+ { "RootDirectory", "s", NULL, offsetof(MachineStatusInfo, root_directory) },
+ { "Leader", "u", NULL, offsetof(MachineStatusInfo, leader) },
+ { "Timestamp", "t", NULL, offsetof(MachineStatusInfo, timestamp) },
+ { "Id", "ay", bus_map_id128, offsetof(MachineStatusInfo, id) },
+ {}
+ };
-static int show_one(const char *verb, sd_bus *bus, const char *path, bool show_properties, bool *new_line) {
- _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
- _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ MachineStatusInfo info = {};
int r;
- MachineStatusInfo machine_info = {};
assert(path);
assert(new_line);
- r = sd_bus_call_method(
- bus,
- "org.freedesktop.machine1",
- path,
- "org.freedesktop.DBus.Properties",
- "GetAll",
- &error,
- &reply,
- "s", "");
+ r = bus_map_all_properties(bus,
+ "org.freedesktop.machine1",
+ path,
+ map,
+ &info);
if (r < 0) {
- log_error("Could not get properties: %s", bus_error_message(&error, -r));
+ log_error("Could not get properties: %s", strerror(-r));
return r;
}
-
if (*new_line)
printf("\n");
-
*new_line = true;
- r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "{sv}");
- if (r < 0)
- goto fail;
-
- while ((r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_DICT_ENTRY, "sv")) > 0) {
- const char *name;
- const char *contents;
-
- r = sd_bus_message_read_basic(reply, SD_BUS_TYPE_STRING, &name);
- if (r < 0)
- goto fail;
+ print_machine_status_info(bus, &info);
- r = sd_bus_message_peek_type(reply, NULL, &contents);
- if (r < 0)
- goto fail;
+ free(info.name);
+ free(info.class);
+ free(info.service);
+ free(info.scope);
+ free(info.root_directory);
- r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_VARIANT, contents);
- if (r < 0)
- goto fail;
+ return r;
+}
- if (show_properties)
- r = print_property(name, reply);
- else
- r = status_property_machine(name, reply, &machine_info);
- if (r < 0)
- goto fail;
+static int show_properties(sd_bus *bus, const char *path, bool *new_line) {
+ int r;
- r = sd_bus_message_exit_container(reply);
- if (r < 0)
- goto fail;
+ if (*new_line)
+ printf("\n");
- r = sd_bus_message_exit_container(reply);
- if (r < 0)
- goto fail;
- }
- if (r < 0)
- goto fail;
+ *new_line = true;
- r = sd_bus_message_exit_container(reply);
+ r = bus_print_all_properties(bus, "org.freedesktop.machine1", path, arg_property, arg_all);
if (r < 0)
- goto fail;
-
- if (!show_properties)
- print_machine_status_info(bus, &machine_info);
+ log_error("Could not get properties: %s", strerror(-r));
- return 0;
-
-fail:
- log_error("Failed to parse reply: %s", strerror(-r));
return r;
}
static int show(sd_bus *bus, char **args, unsigned n) {
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- int r, ret = 0;
+ int r = 0;
unsigned i;
- bool show_properties, new_line = false;
+ bool properties, new_line = false;
assert(bus);
assert(args);
- show_properties = !strstr(args[0], "status");
+ properties = !strstr(args[0], "status");
pager_open_if_enabled();
- if (show_properties && n <= 1) {
+ if (properties && n <= 1) {
- /* If no argument is specified inspect the manager
+ /* If no argument is specified, inspect the manager
* itself */
-
- return show_one(args[0], bus, "/org/freedesktop/machine1", show_properties, &new_line);
+ r = show_properties(bus, "/org/freedesktop/machine1", &new_line);
+ if (r < 0) {
+ log_error("Failed to query properties: %s", strerror(-r));
+ return r;
+ }
}
for (i = 1; i < n; i++) {
}
r = sd_bus_message_read(reply, "o", &path);
- if (r < 0) {
- log_error("Failed to parse reply: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return bus_log_parse_error(r);
- r = show_one(args[0], bus, path, show_properties, &new_line);
- if (r != 0)
- ret = r;
+ if (properties)
+ r = show_properties(bus, path, &new_line);
+ else
+ r = show_info(args[0], bus, path, &new_line);
}
- return ret;
+ return r;
}
static int kill_machine(sd_bus *bus, char **args, unsigned n) {
static int openpt_in_namespace(pid_t pid, int flags) {
_cleanup_close_ int nsfd = -1, rootfd = -1;
- _cleanup_free_ char *ns = NULL, *root = NULL;
_cleanup_close_pipe_ int sock[2] = { -1, -1 };
- struct msghdr mh;
union {
struct cmsghdr cmsghdr;
uint8_t buf[CMSG_SPACE(sizeof(int))];
- } control;
+ } control = {};
+ struct msghdr mh = {
+ .msg_control = &control,
+ .msg_controllen = sizeof(control),
+ };
struct cmsghdr *cmsg;
- int master, r;
+ int master = -1, r;
+ char *ns, *root;
pid_t child;
siginfo_t si;
- r = asprintf(&ns, "/proc/%lu/ns/mnt", (unsigned long) pid);
- if (r < 0)
- return -ENOMEM;
+ ns = procfs_file_alloca(pid, "ns/mnt");
nsfd = open(ns, O_RDONLY|O_NOCTTY|O_CLOEXEC);
if (nsfd < 0)
return -errno;
- r = asprintf(&root, "/proc/%lu/root", (unsigned long) pid);
- if (r < 0)
- return -ENOMEM;
+ root = procfs_file_alloca(pid, "root");
rootfd = open(root, O_RDONLY|O_NOCTTY|O_CLOEXEC|O_DIRECTORY);
if (rootfd < 0)
if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sock) < 0)
return -errno;
- zero(control);
- zero(mh);
- mh.msg_control = &control;
- mh.msg_controllen = sizeof(control);
-
child = fork();
if (child < 0)
return -errno;
}
r = sd_bus_message_read(reply, "o", &path);
- if (r < 0) {
- log_error("Failed to parse reply: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return bus_log_parse_error(r);
r = sd_bus_get_property(
bus,
}
r = sd_bus_message_read(reply2, "u", &leader);
- if (r < 0) {
- log_error("Failed to parse reply: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return bus_log_parse_error(r);
master = openpt_in_namespace(leader, O_RDWR|O_NOCTTY|O_CLOEXEC|O_NDELAY);
if (master < 0) {
return r;
}
+ container_bus = sd_bus_unref(container_bus);
+
assert_se(sigemptyset(&mask) == 0);
sigset_add_many(&mask, SIGWINCH, SIGTERM, SIGINT, -1);
assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
{ "host", required_argument, NULL, 'H' },
{ "machine", required_argument, NULL, 'M' },
{ "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD },
- { NULL, 0, NULL, 0 }
+ {}
};
int c, r;
switch (c) {
case 'h':
- help();
- return 0;
+ return help();
case ARG_VERSION:
puts(PACKAGE_STRING);
return -EINVAL;
default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
+ assert_not_reached("Unhandled option");
}
}
left = argc - optind;
if (left <= 0)
- /* Special rule: no arguments means "list-sessions" */
+ /* Special rule: no arguments means "list" */
i = 0;
else {
if (streq(argv[optind], "help")) {
}
int main(int argc, char*argv[]) {
- int r, ret = EXIT_FAILURE;
_cleanup_bus_unref_ sd_bus *bus = NULL;
+ int r;
setlocale(LC_ALL, "");
log_parse_environment();
log_open();
r = parse_argv(argc, argv);
- if (r < 0)
- goto finish;
- else if (r == 0) {
- ret = EXIT_SUCCESS;
+ if (r <= 0)
goto finish;
- }
r = bus_open_transport(arg_transport, arg_host, false, &bus);
if (r < 0) {
log_error("Failed to create bus connection: %s", strerror(-r));
- ret = EXIT_FAILURE;
goto finish;
}
r = machinectl_main(bus, argc, argv);
- ret = r < 0 ? EXIT_FAILURE : r;
finish:
- strv_free(arg_property);
-
pager_close();
- return ret;
+ strv_free(arg_property);
+
+ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}