shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-26 10:03:40 +03:00
Code

machined: introduce a common function for redirecting machine method calls from manager to machine object

Browse Source 
Let's shorten the code a bit, and unify how we forward executoin from
the machine functions that take a machine name as first argument to the
matching functions on the machine object.
This commit is contained in:
Lennart Poettering 2018-04-06 19:09:53 +02:00
parent ace9ab19ff
commit eecf0181e1
1 changed files with 17 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
src/machine/machined-dbus.c
View File

@ -450,14 +450,14 @@ static int method_register_machine(sd_bus_message *message, void *userdata, sd_b
return method_register_machine_internal(message, false, userdata, error); return method_register_machine_internal(message, false, userdata, error);
} }
static int method_terminate_machine(sd_bus_message *message, void *userdata, sd_bus_error *error) { static int redirect_method_to_machine(sd_bus_message *message, Manager *m, sd_bus_error *error, sd_bus_message_handler_t method) {
Manager *m = userdata;
Machine *machine; Machine *machine;
const char *name; const char *name;
int r; int r;
assert(message); assert(message);
assert(m); assert(m);
assert(method);
r = sd_bus_message_read(message, "s", &name); r = sd_bus_message_read(message, "s", &name);
if (r < 0) if (r < 0)
@ -467,67 +467,23 @@ static int method_terminate_machine(sd_bus_message *message, void *userdata, sd_
if (!machine) if (!machine)
return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_MACHINE, "No machine '%s' known", name); return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_MACHINE, "No machine '%s' known", name);
return bus_machine_method_terminate(message, machine, error); return method(message, machine, error);
}
static int method_terminate_machine(sd_bus_message *message, void *userdata, sd_bus_error *error) {
return redirect_method_to_machine(message, userdata, error, bus_machine_method_terminate);
} }
static int method_kill_machine(sd_bus_message *message, void *userdata, sd_bus_error *error) { static int method_kill_machine(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Manager *m = userdata; return redirect_method_to_machine(message, userdata, error, bus_machine_method_kill);
Machine *machine;
const char *name;
int r;
assert(message);
assert(m);
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
return sd_bus_error_set_errno(error, r);
machine = hashmap_get(m->machines, name);
if (!machine)
return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_MACHINE, "No machine '%s' known", name);
return bus_machine_method_kill(message, machine, error);
} }
static int method_get_machine_addresses(sd_bus_message *message, void *userdata, sd_bus_error *error) { static int method_get_machine_addresses(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Manager *m = userdata; return redirect_method_to_machine(message, userdata, error, bus_machine_method_get_addresses);
Machine *machine;
const char *name;
int r;
assert(message);
assert(m);
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
return sd_bus_error_set_errno(error, r);
machine = hashmap_get(m->machines, name);
if (!machine)
return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_MACHINE, "No machine '%s' known", name);
return bus_machine_method_get_addresses(message, machine, error);
} }
static int method_get_machine_os_release(sd_bus_message *message, void *userdata, sd_bus_error *error) { static int method_get_machine_os_release(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Manager *m = userdata; return redirect_method_to_machine(message, userdata, error, bus_machine_method_get_os_release);
Machine *machine;
const char *name;
int r;
assert(message);
assert(m);
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
return sd_bus_error_set_errno(error, r);
machine = hashmap_get(m->machines, name);
if (!machine)
return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_MACHINE, "No machine '%s' known", name);
return bus_machine_method_get_os_release(message, machine, error);
} }
static int method_list_images(sd_bus_message *message, void *userdata, sd_bus_error *error) { static int method_list_images(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@ -584,144 +540,31 @@ static int method_list_images(sd_bus_message *message, void *userdata, sd_bus_er
} }
static int method_open_machine_pty(sd_bus_message *message, void *userdata, sd_bus_error *error) { static int method_open_machine_pty(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Manager *m = userdata; return redirect_method_to_machine(message, userdata, error, bus_machine_method_open_pty);
Machine *machine;
const char *name;
int r;
assert(message);
assert(m);
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
return sd_bus_error_set_errno(error, r);
machine = hashmap_get(m->machines, name);
if (!machine)
return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_MACHINE, "No machine '%s' known", name);
return bus_machine_method_open_pty(message, machine, error);
} }
static int method_open_machine_login(sd_bus_message *message, void *userdata, sd_bus_error *error) { static int method_open_machine_login(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Manager *m = userdata; return redirect_method_to_machine(message, userdata, error, bus_machine_method_open_login);
Machine *machine;
const char *name;
int r;
assert(message);
assert(m);
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
return r;
machine = hashmap_get(m->machines, name);
if (!machine)
return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_MACHINE, "No machine '%s' known", name);
return bus_machine_method_open_login(message, machine, error);
} }
static int method_open_machine_shell(sd_bus_message *message, void *userdata, sd_bus_error *error) { static int method_open_machine_shell(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Manager *m = userdata; return redirect_method_to_machine(message, userdata, error, bus_machine_method_open_shell);
Machine *machine;
const char *name;
int r;
assert(message);
assert(m);
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
return r;
machine = hashmap_get(m->machines, name);
if (!machine)
return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_MACHINE, "No machine '%s' known", name);
return bus_machine_method_open_shell(message, machine, error);
} }
static int method_bind_mount_machine(sd_bus_message *message, void *userdata, sd_bus_error *error) { static int method_bind_mount_machine(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Manager *m = userdata; return redirect_method_to_machine(message, userdata, error, bus_machine_method_bind_mount);
Machine *machine;
const char *name;
int r;
assert(message);
assert(m);
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
return r;
machine = hashmap_get(m->machines, name);
if (!machine)
return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_MACHINE, "No machine '%s' known", name);
return bus_machine_method_bind_mount(message, machine, error);
} }
static int method_copy_machine(sd_bus_message *message, void *userdata, sd_bus_error *error) { static int method_copy_machine(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Manager *m = userdata; return redirect_method_to_machine(message, userdata, error, bus_machine_method_copy);
Machine *machine;
const char *name;
int r;
assert(message);
assert(m);
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
return r;
machine = hashmap_get(m->machines, name);
if (!machine)
return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_MACHINE, "No machine '%s' known", name);
return bus_machine_method_copy(message, machine, error);
} }
static int method_open_machine_root_directory(sd_bus_message *message, void *userdata, sd_bus_error *error) { static int method_open_machine_root_directory(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Manager *m = userdata; return redirect_method_to_machine(message, userdata, error, bus_machine_method_open_root_directory);
Machine *machine;
const char *name;
int r;
assert(message);
assert(m);
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
return r;
machine = hashmap_get(m->machines, name);
if (!machine)
return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_MACHINE, "No machine '%s' known", name);
return bus_machine_method_open_root_directory(message, machine, error);
} }
static int method_get_machine_uid_shift(sd_bus_message *message, void *userdata, sd_bus_error *error) { static int method_get_machine_uid_shift(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Manager *m = userdata; return redirect_method_to_machine(message, userdata, error, bus_machine_method_get_uid_shift);
Machine *machine;
const char *name;
int r;
assert(message);
assert(m);
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
return r;
machine = hashmap_get(m->machines, name);
if (!machine)
return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_MACHINE, "No machine '%s' known", name);
return bus_machine_method_get_uid_shift(message, machine, error);
} }
static int method_remove_image(sd_bus_message *message, void *userdata, sd_bus_error *error) { static int method_remove_image(sd_bus_message *message, void *userdata, sd_bus_error *error) {