diff options
Diffstat (limited to 'src/machine/machine-dbus.c')
| -rw-r--r-- | src/machine/machine-dbus.c | 383 |
1 files changed, 122 insertions, 261 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index ceab96e078..150a3f7761 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -22,231 +22,153 @@ #include <errno.h> #include <string.h> -#include "machined.h" +#include "bus-util.h" #include "machine.h" -#include "dbus-common.h" - -#define BUS_MACHINE_INTERFACE \ - " <interface name=\"org.freedesktop.machine1.Machine\">\n" \ - " <method name=\"Terminate\"/>\n" \ - " <method name=\"Kill\">\n" \ - " <arg name=\"who\" type=\"s\"/>\n" \ - " <arg name=\"signal\" type=\"s\"/>\n" \ - " </method>\n" \ - " <property name=\"Name\" type=\"s\" access=\"read\"/>\n" \ - " <property name=\"Id\" type=\"ay\" access=\"read\"/>\n" \ - " <property name=\"Timestamp\" type=\"t\" access=\"read\"/>\n" \ - " <property name=\"TimestampMonotonic\" type=\"t\" access=\"read\"/>\n" \ - " <property name=\"Service\" type=\"s\" access=\"read\"/>\n" \ - " <property name=\"Scope\" type=\"s\" access=\"read\"/>\n" \ - " <property name=\"Leader\" type=\"u\" access=\"read\"/>\n" \ - " <property name=\"Class\" type=\"s\" access=\"read\"/>\n" \ - " <property name=\"State\" type=\"s\" access=\"read\"/>\n" \ - " <property name=\"RootDirectory\" type=\"s\" access=\"read\"/>\n" \ - " </interface>\n" - -#define INTROSPECTION \ - DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \ - "<node>\n" \ - BUS_MACHINE_INTERFACE \ - BUS_PROPERTIES_INTERFACE \ - BUS_PEER_INTERFACE \ - BUS_INTROSPECTABLE_INTERFACE \ - "</node>\n" - -#define INTERFACES_LIST \ - BUS_GENERIC_INTERFACES_LIST \ - "org.freedesktop.machine1.Machine\0" - -static int bus_machine_append_id(DBusMessageIter *i, const char *property, void *data) { - DBusMessageIter sub; - Machine *m = data; - dbus_bool_t b; - void *p; - - assert(i); - assert(property); - assert(m); - if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "y", &sub)) - return -ENOMEM; +static int property_get_id( + sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + sd_bus_error *error, + void *userdata) { - p = &m->id; - b = dbus_message_iter_append_fixed_array(&sub, DBUS_TYPE_BYTE, &p, 16); - if (!b) - return -ENOMEM; + Machine *m = userdata; + int r; - if (!dbus_message_iter_close_container(i, &sub)) - return -ENOMEM; + assert(bus); + assert(reply); + assert(m); + + r = sd_bus_message_append_array(reply, 'y', &m->id, 16); + if (r < 0) + return r; - return 0; + return 1; } -static int bus_machine_append_state(DBusMessageIter *i, const char *property, void *data) { - Machine *m = data; +static int property_get_state( + sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + sd_bus_error *error, + void *userdata) { + + Machine *m = userdata; const char *state; + int r; - assert(i); - assert(property); + assert(bus); + assert(reply); assert(m); state = machine_state_to_string(machine_get_state(m)); - if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &state)) - return -ENOMEM; + r = sd_bus_message_append_basic(reply, 's', state); + if (r < 0) + return r; - return 0; + return 1; } -static int get_machine_for_path(Manager *m, const char *path, Machine **_machine) { - _cleanup_free_ char *e = NULL; - Machine *machine; - - assert(m); - assert(path); - assert(_machine); +static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_class, machine_class, MachineClass); - if (!startswith(path, "/org/freedesktop/machine1/machine/")) - return -EINVAL; +static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata) { + Machine *m = userdata; + int r; - e = bus_path_unescape(path + 34); - if (!e) - return -ENOMEM; + assert(bus); + assert(message); + assert(m); - machine = hashmap_get(m->machines, e); - if (!machine) - return -ENOENT; + r = machine_stop(m); + if (r < 0) + return sd_bus_reply_method_errno(bus, message, r, NULL); - *_machine = machine; - return 0; + return sd_bus_reply_method_return(bus, message, NULL); } -static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_machine_append_class, machine_class, MachineClass); - -static const BusProperty bus_machine_machine_properties[] = { - { "Name", bus_property_append_string, "s", offsetof(Machine, name), true }, - { "Id", bus_machine_append_id, "ay", 0 }, - { "Timestamp", bus_property_append_usec, "t", offsetof(Machine, timestamp.realtime) }, - { "TimestampMonotonic", bus_property_append_usec, "t", offsetof(Machine, timestamp.monotonic) }, - { "Service", bus_property_append_string, "s", offsetof(Machine, service), true }, - { "Scope", bus_property_append_string, "s", offsetof(Machine, scope), true }, - { "Leader", bus_property_append_pid, "u", offsetof(Machine, leader) }, - { "Class", bus_machine_append_class, "s", offsetof(Machine, class) }, - { "State", bus_machine_append_state, "s", 0 }, - { "RootDirectory", bus_property_append_string, "s", offsetof(Machine, root_directory), true }, - { NULL, } -}; - -static DBusHandlerResult machine_message_dispatch( - Machine *m, - DBusConnection *connection, - DBusMessage *message) { - - DBusError error; - _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; +static int method_kill(sd_bus *bus, sd_bus_message *message, void *userdata) { + Machine *m = userdata; + const char *swho; + int32_t signo; + KillWho who; int r; - assert(m); - assert(connection); + assert(bus); assert(message); + assert(m); - if (dbus_message_is_method_call(message, "org.freedesktop.machine1.Machine", "Terminate")) { - - r = machine_stop(m); - if (r < 0) - return bus_send_error_reply(connection, message, NULL, r); - - reply = dbus_message_new_method_return(message); - if (!reply) - goto oom; - - } else if (dbus_message_is_method_call(message, "org.freedesktop.machine1.Machine", "Kill")) { - const char *swho; - int32_t signo; - KillWho who; - - if (!dbus_message_get_args( - message, - &error, - DBUS_TYPE_STRING, &swho, - DBUS_TYPE_INT32, &signo, - DBUS_TYPE_INVALID)) - return bus_send_error_reply(connection, message, &error, -EINVAL); - - if (isempty(swho)) - who = KILL_ALL; - else { - who = kill_who_from_string(swho); - if (who < 0) - return bus_send_error_reply(connection, message, &error, -EINVAL); - } - - if (signo <= 0 || signo >= _NSIG) - return bus_send_error_reply(connection, message, &error, -EINVAL); - - r = machine_kill(m, who, signo); - if (r < 0) - return bus_send_error_reply(connection, message, NULL, r); - - reply = dbus_message_new_method_return(message); - if (!reply) - goto oom; - - } else { - const BusBoundProperties bps[] = { - { "org.freedesktop.machine1.Machine", bus_machine_machine_properties, m }, - { NULL, } - }; - - return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps); - } + r = sd_bus_message_read(message, "si", &swho, &signo); + if (r < 0) + return sd_bus_reply_method_errno(bus, message, r, NULL); - if (reply) { - if (!bus_maybe_send_reply(connection, message, reply)) - goto oom; + if (isempty(swho)) + who = KILL_ALL; + else { + who = kill_who_from_string(swho); + if (who < 0) + return sd_bus_reply_method_errorf(bus, message, SD_BUS_ERROR_INVALID_ARGS, "Invalid kill parameter '%s'", swho); } - return DBUS_HANDLER_RESULT_HANDLED; + if (signo <= 0 || signo >= _NSIG) + return sd_bus_reply_method_errorf(bus, message, SD_BUS_ERROR_INVALID_ARGS, "Invalid signal %i", signo); -oom: - dbus_error_free(&error); + r = machine_kill(m, who, signo); + if (r < 0) + return sd_bus_reply_method_errno(bus, message, r, NULL); - return DBUS_HANDLER_RESULT_NEED_MEMORY; + return sd_bus_reply_method_return(bus, message, NULL); } -static DBusHandlerResult machine_message_handler( - DBusConnection *connection, - DBusMessage *message, - void *userdata) { - - Manager *manager = userdata; - Machine *m; - int r; +const sd_bus_vtable machine_vtable[] = { + SD_BUS_VTABLE_START(0), + SD_BUS_PROPERTY("Name", "s", NULL, offsetof(Machine, name), 0), + SD_BUS_PROPERTY("Id", "ay", property_get_id, 0, 0), + SD_BUS_PROPERTY("Timestamp", "t", NULL, offsetof(Machine, timestamp.realtime), 0), + SD_BUS_PROPERTY("TimestampMonotonic", "t", NULL, offsetof(Machine, timestamp.monotonic), 0), + SD_BUS_PROPERTY("Service", "s", NULL, offsetof(Machine, service), 0), + SD_BUS_PROPERTY("Scope", "s", NULL, offsetof(Machine, scope), 0), + SD_BUS_PROPERTY("Leader", "u", NULL, offsetof(Machine, leader), 0), + SD_BUS_PROPERTY("Class", "s", property_get_class, offsetof(Machine, class), 0), + SD_BUS_PROPERTY("State", "s", property_get_state, 0, 0), + SD_BUS_PROPERTY("RootDirectory", "s", NULL, offsetof(Machine, root_directory), 0), + SD_BUS_METHOD("Terminate", NULL, NULL, method_terminate, 0), + SD_BUS_METHOD("Kill", "si", NULL, method_kill, 0), + SD_BUS_VTABLE_END +}; - r = get_machine_for_path(manager, dbus_message_get_path(message), &m); - if (r < 0) { +int machine_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata) { + _cleanup_free_ char *e = NULL; + Manager *m = userdata; + Machine *machine; + const char *p; - if (r == -ENOMEM) - return DBUS_HANDLER_RESULT_NEED_MEMORY; + assert(bus); + assert(path); + assert(interface); + assert(found); + assert(m); - if (r == -ENOENT) { - DBusError e; + p = startswith(path, "/org/freedesktop/machine1/machine/"); + if (!p) + return 0; - dbus_error_init(&e); - dbus_set_error_const(&e, DBUS_ERROR_UNKNOWN_OBJECT, "Unknown machine"); - return bus_send_error_reply(connection, message, &e, r); - } + e = bus_path_unescape(p); + if (!e) + return -ENOMEM; - return bus_send_error_reply(connection, message, NULL, r); - } + machine = hashmap_get(m->machines, e); + if (!machine) + return 0; - return machine_message_dispatch(m, connection, message); + *found = machine; + return 1; } -const DBusObjectPathVTable bus_machine_vtable = { - .message_function = machine_message_handler -}; - char *machine_bus_path(Machine *m) { _cleanup_free_ char *e = NULL; @@ -260,105 +182,44 @@ char *machine_bus_path(Machine *m) { } int machine_send_signal(Machine *m, bool new_machine) { - _cleanup_dbus_message_unref_ DBusMessage *msg = NULL; _cleanup_free_ char *p = NULL; assert(m); - msg = dbus_message_new_signal("/org/freedesktop/machine1", - "org.freedesktop.machine1.Manager", - new_machine ? "MachineNew" : "MachineRemoved"); - - if (!m) - return -ENOMEM; - p = machine_bus_path(m); if (!p) return -ENOMEM; - if (!dbus_message_append_args( - msg, - DBUS_TYPE_STRING, &m->name, - DBUS_TYPE_OBJECT_PATH, &p, - DBUS_TYPE_INVALID)) - return -ENOMEM; - - if (!dbus_connection_send(m->manager->bus, msg, NULL)) - return -ENOMEM; - - return 0; + return sd_bus_emit_signal( + m->manager->bus, + "/org/freedesktop/machine1", + "org.freedesktop.machine1.Manager", + new_machine ? "MachineNew" : "MachineRemoved", + "so", m->name, p); } -int machine_send_changed(Machine *m, const char *properties) { - _cleanup_dbus_message_unref_ DBusMessage *msg = NULL; +int machine_send_create_reply(Machine *m, sd_bus_error *error) { + _cleanup_bus_message_unref_ sd_bus_message *c = NULL; _cleanup_free_ char *p = NULL; assert(m); - if (!m->started) - return 0; - - p = machine_bus_path(m); - if (!p) - return -ENOMEM; - - msg = bus_properties_changed_new(p, "org.freedesktop.machine1.Machine", properties); - if (!msg) - return -ENOMEM; - - if (!dbus_connection_send(m->manager->bus, msg, NULL)) - return -ENOMEM; - - return 0; -} - -int machine_send_create_reply(Machine *m, DBusError *error) { - _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; - - assert(m); - if (!m->create_message) return 0; - if (error) { - DBusError buffer; - - dbus_error_init(&buffer); - - if (!error || !dbus_error_is_set(error)) { - dbus_set_error_const(&buffer, DBUS_ERROR_INVALID_ARGS, "Invalid Arguments"); - error = &buffer; - } - - reply = dbus_message_new_error(m->create_message, error->name, error->message); - dbus_error_free(&buffer); - - if (!reply) - return log_oom(); - } else { - _cleanup_free_ char *p = NULL; - - p = machine_bus_path(m); - if (!p) - return log_oom(); - - reply = dbus_message_new_method_return(m->create_message); - if (!reply) - return log_oom(); - - if (!dbus_message_append_args(reply, DBUS_TYPE_OBJECT_PATH, &p, DBUS_TYPE_INVALID)) - return log_oom(); - } + c = m->create_message; + m->create_message = NULL; /* Update the machine state file before we notify the client * about the result. */ machine_save(m); - if (!dbus_connection_send(m->manager->bus, reply, NULL)) - return log_oom(); + if (error) + return sd_bus_reply_method_error(m->manager->bus, c, error); - dbus_message_unref(m->create_message); - m->create_message = NULL; + p = machine_bus_path(m); + if (!p) + return -ENOMEM; - return 0; + return sd_bus_reply_method_return(m->manager->bus, c, "o", p); } |