summaryrefslogtreecommitdiff
path: root/src/core/dbus-unit.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-11-19 21:12:59 +0100
committerLennart Poettering <lennart@poettering.net>2013-11-20 20:52:36 +0100
commit718db96199eb307751264e4163555662c9a389fa (patch)
tree9ec8467596ba1acba76bb6273c7797baf68c1a00 /src/core/dbus-unit.c
parent3febea3a0b0a968ea281e7959c1654cbaf95c9bf (diff)
core: convert PID 1 to libsystemd-bus
This patch converts PID 1 to libsystemd-bus and thus drops the dependency on libdbus. The only remaining code using libdbus is a test case that validates our bus marshalling against libdbus' marshalling, and this dependency can be turned off. This patch also adds a couple of things to libsystem-bus, that are necessary to make the port work: - Synthesizing of "Disconnected" messages when bus connections are severed. - Support for attaching multiple vtables for the same interface on the same path. This patch also fixes the SetDefaultTarget() and GetDefaultTarget() bus calls which used an inappropriate signature. As a side effect we will now generate PropertiesChanged messages which carry property contents, rather than just invalidation information.
Diffstat (limited to 'src/core/dbus-unit.c')
-rw-r--r--src/core/dbus-unit.c1308
1 files changed, 591 insertions, 717 deletions
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index 032915d14e..49054781c0 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -19,609 +19,645 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <errno.h>
-
-#include "dbus.h"
+#include "sd-bus.h"
#include "log.h"
-#include "dbus-unit.h"
-#include "bus-errors.h"
-#include "dbus-common.h"
#include "selinux-access.h"
#include "cgroup-util.h"
#include "strv.h"
#include "path-util.h"
#include "fileio.h"
+#include "dbus-unit.h"
+#include "dbus-manager.h"
+#include "bus-errors.h"
+#include "dbus-client-track.h"
+
+static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_load_state, unit_load_state, UnitLoadState);
+
+static int property_get_names(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
+
+ Unit *u = userdata;
+ Iterator i;
+ const char *t;
+ int r;
-const char bus_unit_interface[] = BUS_UNIT_INTERFACE;
-
-#define INVALIDATING_PROPERTIES \
- "LoadState\0" \
- "ActiveState\0" \
- "SubState\0" \
- "InactiveExitTimestamp\0" \
- "ActiveEnterTimestamp\0" \
- "ActiveExitTimestamp\0" \
- "InactiveEnterTimestamp\0" \
- "Job\0" \
- "NeedDaemonReload\0"
-
-static int bus_unit_append_names(DBusMessageIter *i, const char *property, void *data) {
- char *t;
- Iterator j;
- DBusMessageIter sub;
- Unit *u = data;
-
- if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "s", &sub))
- return -ENOMEM;
+ assert(bus);
+ assert(reply);
+ assert(u);
- SET_FOREACH(t, u->names, j)
- if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &t))
- return -ENOMEM;
+ r = sd_bus_message_open_container(reply, 'a', "s");
+ if (r < 0)
+ return r;
- if (!dbus_message_iter_close_container(i, &sub))
- return -ENOMEM;
+ SET_FOREACH(t, u->names, i) {
+ r = sd_bus_message_append(reply, "s", t);
+ if (r < 0)
+ return r;
+ }
- return 0;
+ return sd_bus_message_close_container(reply);
}
-static int bus_unit_append_following(DBusMessageIter *i, const char *property, void *data) {
- Unit *u = data, *f;
- const char *d;
+static int property_get_following(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
+
+ Unit *u = userdata, *f;
- assert(i);
- assert(property);
+ assert(bus);
+ assert(reply);
assert(u);
f = unit_following(u);
- d = f ? f->id : "";
-
- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &d))
- return -ENOMEM;
-
- return 0;
+ return sd_bus_message_append(reply, "s", f ? f->id : "");
}
-static int bus_unit_append_slice(DBusMessageIter *i, const char *property, void *data) {
- Unit *u = data;
- const char *d;
-
- assert(i);
- assert(property);
- assert(u);
-
- d = strempty(unit_slice_name(u));
-
- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &d))
- return -ENOMEM;
+static int property_get_dependencies(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
- return 0;
-}
-
-static int bus_unit_append_dependencies(DBusMessageIter *i, const char *property, void *data) {
- Unit *u;
+ Set *s = *(Set**) userdata;
Iterator j;
- DBusMessageIter sub;
- Set *s = data;
+ Unit *u;
+ int r;
- if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "s", &sub))
- return -ENOMEM;
+ assert(bus);
+ assert(reply);
- SET_FOREACH(u, s, j)
- if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &u->id))
- return -ENOMEM;
+ r = sd_bus_message_open_container(reply, 'a', "s");
+ if (r < 0)
+ return r;
- if (!dbus_message_iter_close_container(i, &sub))
- return -ENOMEM;
+ SET_FOREACH(u, s, j) {
+ r = sd_bus_message_append(reply, "s", u->id);
+ if (r < 0)
+ return r;
+ }
- return 0;
+ return sd_bus_message_close_container(reply);
}
-static int bus_unit_append_description(DBusMessageIter *i, const char *property, void *data) {
- Unit *u = data;
- const char *d;
+static int property_get_description(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
- assert(i);
- assert(property);
- assert(u);
-
- d = unit_description(u);
+ Unit *u = userdata;
- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &d))
- return -ENOMEM;
+ assert(bus);
+ assert(reply);
+ assert(u);
- return 0;
+ return sd_bus_message_append(reply, "s", unit_description(u));
}
-static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_unit_append_load_state, unit_load_state, UnitLoadState);
+static int property_get_active_state(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
-static int bus_unit_append_active_state(DBusMessageIter *i, const char *property, void *data) {
- Unit *u = data;
- const char *state;
+ Unit *u = userdata;
- assert(i);
- assert(property);
+ assert(bus);
+ assert(reply);
assert(u);
- state = unit_active_state_to_string(unit_active_state(u));
-
- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &state))
- return -ENOMEM;
-
- return 0;
+ return sd_bus_message_append(reply, "s", unit_active_state_to_string(unit_active_state(u)));
}
-static int bus_unit_append_sub_state(DBusMessageIter *i, const char *property, void *data) {
- Unit *u = data;
- const char *state;
-
- assert(i);
- assert(property);
- assert(u);
+static int property_get_sub_state(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
- state = unit_sub_state_to_string(u);
+ Unit *u = userdata;
- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &state))
- return -ENOMEM;
+ assert(bus);
+ assert(reply);
+ assert(u);
- return 0;
+ return sd_bus_message_append(reply, "s", unit_sub_state_to_string(u));
}
-static int bus_unit_append_file_state(DBusMessageIter *i, const char *property, void *data) {
- Unit *u = data;
- const char *state;
+static int property_get_unit_file_state(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
- assert(i);
- assert(property);
- assert(u);
+ Unit *u = userdata;
- state = strempty(unit_file_state_to_string(unit_get_unit_file_state(u)));
-
- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &state))
- return -ENOMEM;
+ assert(bus);
+ assert(reply);
+ assert(u);
- return 0;
+ return sd_bus_message_append(reply, "s", unit_file_state_to_string(unit_get_unit_file_state(u)));
}
-static int bus_unit_append_can_start(DBusMessageIter *i, const char *property, void *data) {
- Unit *u = data;
- dbus_bool_t b;
-
- assert(i);
- assert(property);
- assert(u);
+static int property_get_can_start(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
- b = unit_can_start(u) &&
- !u->refuse_manual_start;
+ Unit *u = userdata;
- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b))
- return -ENOMEM;
+ assert(bus);
+ assert(reply);
+ assert(u);
- return 0;
+ return sd_bus_message_append(reply, "b", unit_can_start(u) && !u->refuse_manual_start);
}
-static int bus_unit_append_can_stop(DBusMessageIter *i, const char *property, void *data) {
- Unit *u = data;
- dbus_bool_t b;
+static int property_get_can_stop(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
+
+ Unit *u = userdata;
- assert(i);
- assert(property);
+ assert(bus);
+ assert(reply);
assert(u);
/* On the lower levels we assume that every unit we can start
* we can also stop */
- b = unit_can_start(u) &&
- !u->refuse_manual_stop;
-
- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b))
- return -ENOMEM;
-
- return 0;
+ return sd_bus_message_append(reply, "b", unit_can_start(u) && !u->refuse_manual_stop);
}
-static int bus_unit_append_can_reload(DBusMessageIter *i, const char *property, void *data) {
- Unit *u = data;
- dbus_bool_t b;
+static int property_get_can_reload(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
- assert(i);
- assert(property);
- assert(u);
-
- b = unit_can_reload(u);
+ Unit *u = userdata;
- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b))
- return -ENOMEM;
+ assert(bus);
+ assert(reply);
+ assert(u);
- return 0;
+ return sd_bus_message_append(reply, "b", unit_can_reload(u));
}
-static int bus_unit_append_can_isolate(DBusMessageIter *i, const char *property, void *data) {
- Unit *u = data;
- dbus_bool_t b;
+static int property_get_can_isolate(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
- assert(i);
- assert(property);
- assert(u);
-
- b = unit_can_isolate(u) &&
- !u->refuse_manual_start;
+ Unit *u = userdata;
- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b))
- return -ENOMEM;
+ assert(bus);
+ assert(reply);
+ assert(u);
- return 0;
+ return sd_bus_message_append(reply, "b", unit_can_isolate(u) && !u->refuse_manual_start);
}
-static int bus_unit_append_job(DBusMessageIter *i, const char *property, void *data) {
- Unit *u = data;
- DBusMessageIter sub;
+static int property_get_job(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
+
_cleanup_free_ char *p = NULL;
+ Unit *u = userdata;
- assert(i);
- assert(property);
+ assert(bus);
+ assert(reply);
assert(u);
- if (!dbus_message_iter_open_container(i, DBUS_TYPE_STRUCT, NULL, &sub))
- return -ENOMEM;
-
- if (u->job) {
+ if (!u->job)
+ return sd_bus_message_append(reply, "(uo)", 0, "/");
- p = job_dbus_path(u->job);
- if (!p)
- return -ENOMEM;
-
- if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_UINT32, &u->job->id) ||
- !dbus_message_iter_append_basic(&sub, DBUS_TYPE_OBJECT_PATH, &p))
- return -ENOMEM;
- } else {
- uint32_t id = 0;
+ p = job_dbus_path(u->job);
+ if (!p)
+ return -ENOMEM;
- /* No job, so let's fill in some placeholder
- * data. Since we need to fill in a valid path we
- * simple point to ourselves. */
+ return sd_bus_message_append(reply, "(uo)", u->job->id, p);
+}
- p = unit_dbus_path(u);
- if (!p)
- return -ENOMEM;
+static int property_get_need_daemon_reload(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
- if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_UINT32, &id) ||
- !dbus_message_iter_append_basic(&sub, DBUS_TYPE_OBJECT_PATH, &p))
- return -ENOMEM;
- }
+ Unit *u = userdata;
- if (!dbus_message_iter_close_container(i, &sub))
- return -ENOMEM;
+ assert(bus);
+ assert(reply);
+ assert(u);
- return 0;
+ return sd_bus_message_append(reply, "b", unit_need_daemon_reload(u));
}
-static int bus_unit_append_need_daemon_reload(DBusMessageIter *i, const char *property, void *data) {
- Unit *u = data;
- dbus_bool_t b;
+static int property_get_conditions(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
- assert(i);
- assert(property);
- assert(u);
+ Unit *u = userdata;
+ Condition *c;
+ int r;
- b = unit_need_daemon_reload(u);
+ assert(bus);
+ assert(reply);
+ assert(u);
- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b))
- return -ENOMEM;
+ r = sd_bus_message_open_container(reply, 'a', "(sbbsi)");
+ if (r < 0)
+ return r;
- return 0;
-}
+ LIST_FOREACH(conditions, c, u->conditions) {
+ r = sd_bus_message_append(reply, "sbbsi", condition_type_to_string(c->type), c->trigger, c->negate, c->parameter, c->state);
+ if (r < 0)
+ return r;
-static int bus_property_append_condition(DBusMessageIter *i, const char *property, void *data) {
- Condition **cp = data;
- Condition *c;
- const char *name, *param;
- dbus_bool_t trigger, negate;
- dbus_int32_t state;
- DBusMessageIter sub;
-
- assert(i);
- assert(property);
- assert(cp);
-
- c = *cp;
- assert(c);
-
- name = condition_type_to_string(c->type);
- param = c->parameter;
- trigger = c->trigger;
- negate = c->negate;
- state = c->state;
-
- if (!dbus_message_iter_open_container(i, DBUS_TYPE_STRUCT, NULL, &sub) ||
- !dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &name) ||
- !dbus_message_iter_append_basic(&sub, DBUS_TYPE_BOOLEAN, &trigger) ||
- !dbus_message_iter_append_basic(&sub, DBUS_TYPE_BOOLEAN, &negate) ||
- !dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &param) ||
- !dbus_message_iter_append_basic(&sub, DBUS_TYPE_INT32, &state) ||
- !dbus_message_iter_close_container(i, &sub))
- return -ENOMEM;
+ }
- return 0;
+ return sd_bus_message_close_container(reply);
}
-static int bus_property_append_condition_list(DBusMessageIter *i, const char *property, void *data) {
- Condition **first = data, *c;
- DBusMessageIter sub;
-
- assert(i);
- assert(data);
+static int property_get_load_error(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
- if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(sbbsi)", &sub))
- return -ENOMEM;
+ _cleanup_bus_error_free_ sd_bus_error e = SD_BUS_ERROR_NULL;
+ Unit *u = userdata;
- LIST_FOREACH(conditions, c, *first)
- bus_property_append_condition(&sub, property, &c);
+ assert(bus);
+ assert(reply);
+ assert(u);
- if (!dbus_message_iter_close_container(i, &sub))
- return -ENOMEM;
+ if (u->load_error != 0)
+ sd_bus_error_set_errno(&e, u->load_error);
- return 0;
+ return sd_bus_message_append(reply, "(ss)", e.name, e.message);
}
-static int bus_unit_append_load_error(DBusMessageIter *i, const char *property, void *data) {
- Unit *u = data;
- const char *name, *message;
- DBusMessageIter sub;
+int bus_unit_method_start_generic(sd_bus *bus, sd_bus_message *message, Unit *u, JobType job_type, bool reload_if_possible) {
+ const char *smode;
+ JobMode mode;
+ int r;
- assert(i);
- assert(property);
+ assert(bus);
+ assert(message);
assert(u);
+ assert(job_type >= 0 && job_type < _JOB_TYPE_MAX);
- if (u->load_error != 0) {
- name = bus_errno_to_dbus(u->load_error);
- message = strempty(strerror(-u->load_error));
- } else
- name = message = "";
+ r = sd_bus_message_read(message, "s", &smode);
+ if (r < 0)
+ return sd_bus_reply_method_errno(bus, message, r, NULL);
- if (!dbus_message_iter_open_container(i, DBUS_TYPE_STRUCT, NULL, &sub) ||
- !dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &name) ||
- !dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &message) ||
- !dbus_message_iter_close_container(i, &sub))
- return -ENOMEM;
+ mode = job_mode_from_string(smode);
+ if (mode < 0)
+ return sd_bus_reply_method_errorf(bus, message, SD_BUS_ERROR_INVALID_ARGS, "Job mode %s invalid", smode);
- return 0;
+ return bus_unit_queue_job(bus, message, u, job_type, mode, reload_if_possible);
}
-static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusConnection *connection, DBusMessage *message) {
- _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
- DBusError error;
- JobType job_type = _JOB_TYPE_INVALID;
- bool reload_if_possible = false;
- int r;
+static int method_start(sd_bus *bus, sd_bus_message *message, void *userdata) {
+ return bus_unit_method_start_generic(bus, message, userdata, JOB_START, false);
+}
- dbus_error_init(&error);
-
- if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "Start"))
- job_type = JOB_START;
- else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "Stop"))
- job_type = JOB_STOP;
- else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "Reload"))
- job_type = JOB_RELOAD;
- else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "Restart"))
- job_type = JOB_RESTART;
- else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "TryRestart"))
- job_type = JOB_TRY_RESTART;
- else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "ReloadOrRestart")) {
- reload_if_possible = true;
- job_type = JOB_RESTART;
- } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "ReloadOrTryRestart")) {
- reload_if_possible = true;
- job_type = JOB_TRY_RESTART;
- } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "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);
- }
+static int method_stop(sd_bus *bus, sd_bus_message *message, void *userdata) {
+ return bus_unit_method_start_generic(bus, message, userdata, JOB_STOP, false);
+}
+
+static int method_reload(sd_bus *bus, sd_bus_message *message, void *userdata) {
+ return bus_unit_method_start_generic(bus, message, userdata, JOB_RELOAD, false);
+}
- if (signo <= 0 || signo >= _NSIG)
- return bus_send_error_reply(connection, message, &error, -EINVAL);
+static int method_restart(sd_bus *bus, sd_bus_message *message, void *userdata) {
+ return bus_unit_method_start_generic(bus, message, userdata, JOB_RESTART, false);
+}
- SELINUX_UNIT_ACCESS_CHECK(u, connection, message, "stop");
+static int method_try_restart(sd_bus *bus, sd_bus_message *message, void *userdata) {
+ return bus_unit_method_start_generic(bus, message, userdata, JOB_TRY_RESTART, false);
+}
- r = unit_kill(u, who, signo, &error);
- if (r < 0)
- return bus_send_error_reply(connection, message, &error, r);
+static int method_reload_or_restart(sd_bus *bus, sd_bus_message *message, void *userdata) {
+ return bus_unit_method_start_generic(bus, message, userdata, JOB_RESTART, true);
+}
- reply = dbus_message_new_method_return(message);
- if (!reply)
- goto oom;
+static int method_reload_or_try_restart(sd_bus *bus, sd_bus_message *message, void *userdata) {
+ return bus_unit_method_start_generic(bus, message, userdata, JOB_TRY_RESTART, true);
+}
- } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "ResetFailed")) {
+int bus_unit_method_kill(sd_bus *bus, sd_bus_message *message, void *userdata) {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ Unit *u = userdata;
+ const char *swho;
+ int32_t signo;
+ KillWho who;
+ int r;
- SELINUX_UNIT_ACCESS_CHECK(u, connection, message, "reload");
+ assert(bus);
+ assert(message);
+ assert(u);
- unit_reset_failed(u);
+ r = sd_bus_message_read(message, "si", &swho, &signo);
+ if (r < 0)
+ return sd_bus_reply_method_errno(bus, message, r, NULL);
+
+ 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 who argument %s", swho);
+ }
- reply = dbus_message_new_method_return(message);
- if (!reply)
- goto oom;
- } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "SetProperties")) {
- DBusMessageIter iter;
- dbus_bool_t runtime;
+ if (signo <= 0 || signo >= _NSIG)
+ return sd_bus_reply_method_errorf(bus, message, SD_BUS_ERROR_INVALID_ARGS, "Signal number out of range.");
- if (!dbus_message_iter_init(message, &iter))
- goto oom;
+ SELINUX_UNIT_ACCESS_CHECK(u, bus, message, "stop");
- if (bus_iter_get_basic_and_next(&iter, DBUS_TYPE_BOOLEAN, &runtime, true) < 0)
- return bus_send_error_reply(connection, message, NULL, -EINVAL);
+ r = unit_kill(u, who, signo, &error);
+ if (r < 0)
+ return sd_bus_reply_method_errno(bus, message, r, &error);
- SELINUX_UNIT_ACCESS_CHECK(u, connection, message, "start");
+ return sd_bus_reply_method_return(bus, message, NULL);
+}
- r = bus_unit_set_properties(u, &iter, runtime ? UNIT_RUNTIME : UNIT_PERSISTENT, true, &error);
- if (r < 0)
- return bus_send_error_reply(connection, message, &error, r);
-
- reply = dbus_message_new_method_return(message);
- if (!reply)
- goto oom;
-
- } else if (UNIT_VTABLE(u)->bus_message_handler)
- return UNIT_VTABLE(u)->bus_message_handler(u, connection, message);
- else
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
- if (job_type != _JOB_TYPE_INVALID) {
- const char *smode;
- JobMode mode;
-
- if (!dbus_message_get_args(
- message,
- &error,
- DBUS_TYPE_STRING, &smode,
- DBUS_TYPE_INVALID))
- return bus_send_error_reply(connection, message, &error, -EINVAL);
-
- mode = job_mode_from_string(smode);
- if (mode < 0) {
- dbus_set_error(&error, BUS_ERROR_INVALID_JOB_MODE, "Job mode %s is invalid.", smode);
- return bus_send_error_reply(connection, message, &error, -EINVAL);
- }
+int bus_unit_method_reset_failed(sd_bus *bus, sd_bus_message *message, void *userdata) {
+ Unit *u = userdata;
- return bus_unit_queue_job(connection, message, u, job_type, mode, reload_if_possible);
- }
+ assert(bus);
+ assert(message);
+ assert(u);
- if (reply)
- if (!bus_maybe_send_reply(connection, message, reply))
- goto oom;
+ SELINUX_UNIT_ACCESS_CHECK(u, bus, message, "reload");
- return DBUS_HANDLER_RESULT_HANDLED;
+ unit_reset_failed(u);
-oom:
- dbus_error_free(&error);
- return DBUS_HANDLER_RESULT_NEED_MEMORY;
+ return sd_bus_reply_method_return(bus, message, NULL);
}
-static DBusHandlerResult bus_unit_message_handler(DBusConnection *connection, DBusMessage *message, void *data) {
- Manager *m = data;
- Unit *u;
- int r;
- _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
- DBusError error;
+int bus_unit_method_set_properties(sd_bus *bus, sd_bus_message *message, void *userdata) {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ Unit *u = userdata;
+ int runtime, r;
- assert(connection);
+ assert(bus);
assert(message);
- assert(m);
-
- dbus_error_init(&error);
+ assert(u);
- if (streq(dbus_message_get_path(message), "/org/freedesktop/systemd1/unit")) {
- /* Be nice to gdbus and return introspection data for our mid-level paths */
+ r = sd_bus_message_read(message, "b", &runtime);
+ if (r < 0)
+ return sd_bus_reply_method_errno(bus, message, r, NULL);
- SELINUX_ACCESS_CHECK(connection, message, "status");
+ SELINUX_UNIT_ACCESS_CHECK(u, bus, message, "start");
- if (dbus_message_is_method_call(message, "org.freedesktop.DBus.Introspectable", "Introspect")) {
- char *introspection = NULL;
- FILE *f;
- Iterator i;
- const char *k;
- size_t size;
+ r = sd_bus_message_enter_container(message, 'a', "(sv)");
+ if (r < 0)
+ return sd_bus_reply_method_errno(bus, message, r, NULL);
- reply = dbus_message_new_method_return(message);
- if (!reply)
- goto oom;
+ r = bus_unit_set_properties(u, message, runtime ? UNIT_RUNTIME : UNIT_PERSISTENT, true, &error);
+ if (r < 0)
+ return sd_bus_reply_method_errno(bus, message, r, &error);
- /* We roll our own introspection code here, instead of
- * relying on bus_default_message_handler() because we
- * need to generate our introspection string
- * dynamically. */
+ r = sd_bus_message_exit_container(message);
+ if (r < 0)
+ return sd_bus_reply_method_errno(bus, message, r, NULL);
- f = open_memstream(&introspection, &size);
- if (!f)
- goto oom;
+ return sd_bus_reply_method_return(bus, message, NULL);
+}
- fputs(DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
- "<node>\n", f);
+const sd_bus_vtable bus_unit_vtable[] = {
+ SD_BUS_VTABLE_START(0),
+
+ SD_BUS_PROPERTY("Id", "s", NULL, offsetof(Unit, id), 0),
+ SD_BUS_PROPERTY("Names", "as", property_get_names, 0, 0),
+ SD_BUS_PROPERTY("Following", "s", property_get_following, 0, 0),
+ SD_BUS_PROPERTY("Requires", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_REQUIRES]), 0),
+ SD_BUS_PROPERTY("RequiresOverridable", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_REQUIRES_OVERRIDABLE]), 0),
+ SD_BUS_PROPERTY("Requisite", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_REQUISITE]), 0),
+ SD_BUS_PROPERTY("RequisiteOverridable", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_REQUISITE_OVERRIDABLE]), 0),
+ SD_BUS_PROPERTY("Wants", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_WANTS]), 0),
+ SD_BUS_PROPERTY("BindsTo", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_BINDS_TO]), 0),
+ SD_BUS_PROPERTY("PartOf", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_PART_OF]), 0),
+ SD_BUS_PROPERTY("RequiredBy", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_REQUIRED_BY]), 0),
+ SD_BUS_PROPERTY("RequiredByOverridable", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_REQUIRED_BY_OVERRIDABLE]), 0),
+ SD_BUS_PROPERTY("WantedBy", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_WANTED_BY]), 0),
+ SD_BUS_PROPERTY("BoundBy", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_BOUND_BY]), 0),
+ SD_BUS_PROPERTY("ConsistsOf", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_CONSISTS_OF]), 0),
+ SD_BUS_PROPERTY("Conflicts", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_CONFLICTS]), 0),
+ SD_BUS_PROPERTY("ConflictedBy", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_CONFLICTED_BY]), 0),
+ SD_BUS_PROPERTY("Before", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_BEFORE]), 0),
+ SD_BUS_PROPERTY("After", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_AFTER]), 0),
+ SD_BUS_PROPERTY("OnFailure", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_ON_FAILURE]), 0),
+ SD_BUS_PROPERTY("Triggers", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_TRIGGERS]), 0),
+ SD_BUS_PROPERTY("TriggeredBy", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_TRIGGERED_BY]), 0),
+ SD_BUS_PROPERTY("PropagatesReloadTo", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_PROPAGATES_RELOAD_TO]), 0),
+ SD_BUS_PROPERTY("ReloadPropagatedFrom", "as", property_get_dependencies, offsetof(Unit, dependencies[UNIT_RELOAD_PROPAGATED_FROM]), 0),
+ SD_BUS_PROPERTY("RequiresMountsFor", "as", NULL, offsetof(Unit, requires_mounts_for), 0),
+ SD_BUS_PROPERTY("Documentation", "as", NULL, offsetof(Unit, documentation), 0),
+ SD_BUS_PROPERTY("Description", "s", property_get_description, 0, 0),
+ SD_BUS_PROPERTY("LoadState", "s", property_get_load_state, offsetof(Unit, load_state), 0),
+ SD_BUS_PROPERTY("ActiveState", "s", property_get_active_state, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("SubState", "s", property_get_sub_state, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("FragmentPath", "s", NULL, offsetof(Unit, fragment_path), 0),
+ SD_BUS_PROPERTY("SourcePath", "s", NULL, offsetof(Unit, source_path), 0),
+ SD_BUS_PROPERTY("DropInPaths", "as", NULL, offsetof(Unit, dropin_paths), 0),
+ SD_BUS_PROPERTY("UnitFileState", "s", property_get_unit_file_state, 0, 0),
+ BUS_PROPERTY_DUAL_TIMESTAMP("InactiveExitTimestamp", offsetof(Unit, inactive_exit_timestamp), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ BUS_PROPERTY_DUAL_TIMESTAMP("ActiveEnterTimestamp", offsetof(Unit, active_enter_timestamp), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ BUS_PROPERTY_DUAL_TIMESTAMP("ActiveExitTimestamp", offsetof(Unit, active_exit_timestamp), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ BUS_PROPERTY_DUAL_TIMESTAMP("InactiveEnterTimestamp", offsetof(Unit, inactive_enter_timestamp), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("CanStart", "b", property_get_can_start, 0, 0),
+ SD_BUS_PROPERTY("CanStop", "b", property_get_can_stop, 0, 0),
+ SD_BUS_PROPERTY("CanReload", "b", property_get_can_reload, 0, 0),
+ SD_BUS_PROPERTY("CanIsolate", "b", property_get_can_isolate, 0, 0),
+ SD_BUS_PROPERTY("Job", "(uo)", property_get_job, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("StopWhenUnneeded", "b", bus_property_get_bool, offsetof(Unit, stop_when_unneeded), 0),
+ SD_BUS_PROPERTY("RefuseManualStart", "b", bus_property_get_bool, offsetof(Unit, refuse_manual_start), 0),
+ SD_BUS_PROPERTY("RefuseManualStop", "b", bus_property_get_bool, offsetof(Unit, refuse_manual_stop), 0),
+ SD_BUS_PROPERTY("AllowIsolate", "b", bus_property_get_bool, offsetof(Unit, allow_isolate), 0),
+ SD_BUS_PROPERTY("DefaultDependencies", "b", bus_property_get_bool, offsetof(Unit, default_dependencies), 0),
+ SD_BUS_PROPERTY("OnFailureIsolate", "b", bus_property_get_bool, offsetof(Unit, on_failure_isolate), 0),
+ SD_BUS_PROPERTY("IgnoreOnIsolate", "b", bus_property_get_bool, offsetof(Unit, ignore_on_isolate), 0),
+ SD_BUS_PROPERTY("IgnoreOnSnapshot", "b", bus_property_get_bool, offsetof(Unit, ignore_on_snapshot), 0),
+ SD_BUS_PROPERTY("NeedDaemonReload", "b", property_get_need_daemon_reload, 0, 0),
+ SD_BUS_PROPERTY("JobTimeoutUSec", "t", bus_property_get_usec, offsetof(Unit, job_timeout), 0),
+ SD_BUS_PROPERTY("ConditionResult", "b", bus_property_get_bool, offsetof(Unit, condition_result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ BUS_PROPERTY_DUAL_TIMESTAMP("ConditionTimestamp", offsetof(Unit, condition_timestamp), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("Conditions", "a(sbbsi)", property_get_conditions, 0, 0),
+ SD_BUS_PROPERTY("LoadError", "(ss)", property_get_load_error, 0, 0),
+ SD_BUS_PROPERTY("Transient", "b", bus_property_get_bool, offsetof(Unit, transient), 0),
+
+ SD_BUS_METHOD("Start", "s", "o", method_start, 0),
+ SD_BUS_METHOD("Stop", "s", "o", method_stop, 0),
+ SD_BUS_METHOD("Reload", "s", "o", method_reload, 0),
+ SD_BUS_METHOD("Restart", "s", "o", method_restart, 0),
+ SD_BUS_METHOD("TryRestart", "s", "o", method_try_restart, 0),
+ SD_BUS_METHOD("ReloadOrRestart", "s", "o", method_reload_or_restart, 0),
+ SD_BUS_METHOD("ReloadOrTryRestart", "s", "o", method_reload_or_try_restart, 0),
+ SD_BUS_METHOD("Kill", "si", NULL, bus_unit_method_kill, 0),
+ SD_BUS_METHOD("ResetFailed", NULL, NULL, bus_unit_method_reset_failed, 0),
+ SD_BUS_METHOD("SetProperties", "ba(sv)", NULL, bus_unit_method_set_properties, 0),
+
+ SD_BUS_VTABLE_END
+};
- fputs(BUS_INTROSPECTABLE_INTERFACE, f);
- fputs(BUS_PEER_INTERFACE, f);
+static int property_get_slice(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ sd_bus_error *error,
+ void *userdata) {
- HASHMAP_FOREACH_KEY(u, k, m->units, i) {
- char *p;
+ Unit *u = userdata;
- if (k != u->id)
- continue;
+ assert(bus);
+ assert(reply);
+ assert(u);
- p = bus_path_escape(k);
- if (!p) {
- fclose(f);
- free(introspection);
- goto oom;
- }
+ return sd_bus_message_append(reply, "s", unit_slice_name(u));
+}
- fprintf(f, "<node name=\"%s\"/>", p);
- free(p);
- }
+const sd_bus_vtable bus_unit_cgroup_vtable[] = {
+ SD_BUS_VTABLE_START(0),
+ SD_BUS_PROPERTY("Slice", "s", property_get_slice, 0, 0),
+ SD_BUS_PROPERTY("ControlGroup", "s", NULL, offsetof(Unit, cgroup_path), 0),
+ SD_BUS_VTABLE_END
+};
- fputs("</node>\n", f);
+static int send_new_signal(sd_bus *bus, const char *destination, void *userdata) {
+ _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+ _cleanup_free_ char *p = NULL;
+ Unit *u = userdata;
+ int r;
- if (ferror(f)) {
- fclose(f);
- free(introspection);
- goto oom;
- }
+ assert(bus);
+ assert(u);
- fclose(f);
+ p = unit_dbus_path(u);
+ if (!u)
+ return -ENOMEM;
- if (!introspection)
- goto oom;
+ r = sd_bus_message_new_signal(
+ bus,
+ "/org/freedesktop/systemd1",
+ "org.freedesktop.systemd1.Manager",
+ "UnitNew",
+ &m);
+ if (r < 0)
+ return r;
- if (!dbus_message_append_args(reply, DBUS_TYPE_STRING, &introspection, DBUS_TYPE_INVALID)) {
- free(introspection);
- goto oom;
- }
+ r = sd_bus_message_append(m, "so", u->id, p);
+ if (r < 0)
+ return r;
- free(introspection);
+ return sd_bus_send_to(bus, m, destination, NULL);
+}
- if (!bus_maybe_send_reply(connection, message, reply))
- goto oom;
+static int send_changed_signal(sd_bus *bus, const char *destination, void *userdata) {
+ _cleanup_free_ char *p = NULL;
+ Unit *u = userdata;
+ int r;
- return DBUS_HANDLER_RESULT_HANDLED;
- }
+ assert(bus);
+ assert(u);
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
- }
+ p = unit_dbus_path(u);
+ if (!u)
+ return -ENOMEM;
- r = manager_load_unit_from_dbus_path(m, dbus_message_get_path(message), &error, &u);
- if (r == -ENOMEM)
- goto oom;
- if (r < 0)
- return bus_send_error_reply(connection, message, &error, r);
+ /* Send a properties changed signal. First for the specific
+ * type, then for the generic unit. The clients may rely on
+ * this order to get atomic behavior if needed. */
- return bus_unit_message_dispatch(u, connection, message);
+ if (UNIT_VTABLE(u)->bus_changing_properties) {
-oom:
- dbus_error_free(&error);
+ r = sd_bus_emit_properties_changed_strv(
+ bus, p,
+ UNIT_VTABLE(u)->bus_interface,
+ (char**) UNIT_VTABLE(u)->bus_changing_properties);
+ if (r < 0)
+ return r;
+ }
- return DBUS_HANDLER_RESULT_NEED_MEMORY;
+ return sd_bus_emit_properties_changed(
+ bus, p,
+ "org.freedesktop.systemd1.Unit",
+ "ActiveState",
+ "SubState",
+ "InactiveExitTimestamp",
+ "ActiveEnterTimestamp",
+ "ActiveExitTimestamp",
+ "InactiveEnterTimestamp",
+ "Job",
+ "ConditionResult",
+ "ConditionTimestamp",
+ NULL);
}
-const DBusObjectPathVTable bus_unit_vtable = {
- .message_function = bus_unit_message_handler
-};
-
void bus_unit_send_change_signal(Unit *u) {
- _cleanup_dbus_message_unref_ DBusMessage *m = NULL;
- _cleanup_free_ char *p = NULL;
int r;
assert(u);
@@ -634,141 +670,77 @@ void bus_unit_send_change_signal(Unit *u) {
if (!u->id)
return;
- if (!bus_has_subscriber(u->manager)) {
- u->sent_dbus_new_signal = true;
- return;
- }
-
- p = unit_dbus_path(u);
- if (!p) {
- log_oom();
- return;
- }
-
- if (u->sent_dbus_new_signal) {
- /* Send a properties changed signal. First for the
- * specific type, then for the generic unit. The
- * clients may rely on this order to get atomic
- * behavior if needed. */
-
- if (UNIT_VTABLE(u)->bus_invalidating_properties) {
-
- m = bus_properties_changed_new(p,
- UNIT_VTABLE(u)->bus_interface,
- UNIT_VTABLE(u)->bus_invalidating_properties);
- if (!m) {
- log_oom();
- return;
- }
-
- r = bus_broadcast(u->manager, m);
- if (r < 0) {
- log_error("Failed to broadcast change message: %s", strerror(-r));
- return;
- }
+ r = bus_manager_foreach_client(u->manager, u->sent_dbus_new_signal ? send_changed_signal : send_new_signal, u);
+ if (r < 0)
+ log_warning("Failed to send unit change signal for %s: %s", u->id, strerror(-r));
- dbus_message_unref(m);
- }
+ u->sent_dbus_new_signal = true;
+}
- m = bus_properties_changed_new(p, "org.freedesktop.systemd1.Unit",
- INVALIDATING_PROPERTIES);
- if (!m) {
- log_oom();
- return;
- }
+static int send_removed_signal(sd_bus *bus, const char *destination, void *userdata) {
+ _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+ _cleanup_free_ char *p = NULL;
+ Unit *u = userdata;
+ int r;
- } else {
- /* Send a new signal */
+ assert(bus);
+ assert(u);
- m = dbus_message_new_signal("/org/freedesktop/systemd1",
- "org.freedesktop.systemd1.Manager",
- "UnitNew");
- if (!m) {
- log_oom();
- return;
- }
+ p = unit_dbus_path(u);
+ if (!u)
+ return -ENOMEM;
- if (!dbus_message_append_args(m,
- DBUS_TYPE_STRING, &u->id,
- DBUS_TYPE_OBJECT_PATH, &p,
- DBUS_TYPE_INVALID)) {
- log_oom();
- return;
- }
- }
+ r = sd_bus_message_new_signal(
+ bus,
+ "/org/freedesktop/systemd1",
+ "org.freedesktop.systemd1.Manager",
+ "UnitRemoved",
+ &m);
+ if (r < 0)
+ return r;
- r = bus_broadcast(u->manager, m);
- if (r < 0) {
- log_error("Failed to broadcast UnitNew/PropertiesChanged message.");
- return;
- }
+ r = sd_bus_message_append(m, "so", u->id, p);
+ if (r < 0)
+ return r;
- u->sent_dbus_new_signal = true;
+ return sd_bus_send_to(bus, m, destination, NULL);
}
void bus_unit_send_removed_signal(Unit *u) {
- _cleanup_free_ char *p = NULL;
- _cleanup_dbus_message_unref_ DBusMessage *m = NULL;
+ int r;
assert(u);
- if (!bus_has_subscriber(u->manager))
- return;
-
if (!u->sent_dbus_new_signal)
bus_unit_send_change_signal(u);
if (!u->id)
return;
- p = unit_dbus_path(u);
- if (!p)
- goto oom;
-
- m = dbus_message_new_signal("/org/freedesktop/systemd1",
- "org.freedesktop.systemd1.Manager",
- "UnitRemoved");
- if (!m)
- goto oom;
-
- if (!dbus_message_append_args(m,
- DBUS_TYPE_STRING, &u->id,
- DBUS_TYPE_OBJECT_PATH, &p,
- DBUS_TYPE_INVALID))
- goto oom;
-
- if (bus_broadcast(u->manager, m) < 0)
- goto oom;
-
- return;
-
-oom:
- log_oom();
+ r = bus_manager_foreach_client(u->manager, send_removed_signal, u);
+ if (r < 0)
+ log_warning("Failed to send unit change signal for %s: %s", u->id, strerror(-r));
}
-DBusHandlerResult bus_unit_queue_job(
- DBusConnection *connection,
- DBusMessage *message,
+int bus_unit_queue_job(
+ sd_bus *bus,
+ sd_bus_message *message,
Unit *u,
JobType type,
JobMode mode,
bool reload_if_possible) {
- _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_free_ char *path = NULL;
Job *j;
- JobBusClient *cl;
- DBusError error;
int r;
- assert(connection);
+ assert(bus);
assert(message);
assert(u);
assert(type >= 0 && type < _JOB_TYPE_MAX);
assert(mode >= 0 && mode < _JOB_MODE_MAX);
- dbus_error_init(&error);
-
if (reload_if_possible && unit_can_reload(u)) {
if (type == JOB_RESTART)
type = JOB_RELOAD_OR_START;
@@ -776,85 +748,61 @@ DBusHandlerResult bus_unit_queue_job(
type = JOB_RELOAD;
}
- SELINUX_UNIT_ACCESS_CHECK(u, connection, message,
+ SELINUX_UNIT_ACCESS_CHECK(u, bus, message,
(type == JOB_START || type == JOB_RESTART || type == JOB_TRY_RESTART) ? "start" :
type == JOB_STOP ? "stop" : "reload");
- if (type == JOB_STOP && (u->load_state == UNIT_NOT_FOUND || u->load_state == UNIT_ERROR) && unit_active_state(u) == UNIT_INACTIVE) {
- dbus_set_error(&error, BUS_ERROR_NO_SUCH_UNIT, "Unit %s not loaded.", u->id);
- return bus_send_error_reply(connection, message, &error, -EPERM);
- }
+ if (type == JOB_STOP &&
+ (u->load_state == UNIT_NOT_FOUND || u->load_state == UNIT_ERROR) &&
+ unit_active_state(u) == UNIT_INACTIVE)
+ return sd_bus_reply_method_errorf(bus, message, BUS_ERROR_NO_SUCH_UNIT, "Unit %s not loaded.", u->id);
if ((type == JOB_START && u->refuse_manual_start) ||
(type == JOB_STOP && u->refuse_manual_stop) ||
- ((type == JOB_RESTART || type == JOB_TRY_RESTART) && (u->refuse_manual_start || u->refuse_manual_stop))) {
- dbus_set_error(&error, BUS_ERROR_ONLY_BY_DEPENDENCY,
- "Operation refused, unit %s may be requested by dependency only.", u->id);
- return bus_send_error_reply(connection, message, &error, -EPERM);
- }
+ ((type == JOB_RESTART || type == JOB_TRY_RESTART) && (u->refuse_manual_start || u->refuse_manual_stop)))
+ return sd_bus_reply_method_errorf(bus, message, BUS_ERROR_ONLY_BY_DEPENDENCY, "Operation refused, unit %s may be requested by dependency only.", u->id);
r = manager_add_job(u->manager, type, u, mode, true, &error, &j);
if (r < 0)
- return bus_send_error_reply(connection, message, &error, r);
-
- cl = job_bus_client_new(connection, bus_message_get_sender_with_fallback(message));
- if (!cl)
- goto oom;
-
- LIST_PREPEND(client, j->bus_client_list, cl);
+ return sd_bus_reply_method_errno(bus, message, r, &error);
- reply = dbus_message_new_method_return(message);
- if (!reply)
- goto oom;
+ r = bus_client_track(&j->subscribed, bus, sd_bus_message_get_sender(message));
+ if (r < 0)
+ return sd_bus_reply_method_errno(bus, message, r, NULL);
path = job_dbus_path(j);
if (!path)
- goto oom;
-
- if (!dbus_message_append_args(
- reply,
- DBUS_TYPE_OBJECT_PATH, &path,
- DBUS_TYPE_INVALID))
- goto oom;
-
- if (!bus_maybe_send_reply(connection, message, reply))
- goto oom;
-
- return DBUS_HANDLER_RESULT_HANDLED;
-
-oom:
- dbus_error_free(&error);
+ return sd_bus_reply_method_errno(bus, message, r, NULL);
- return DBUS_HANDLER_RESULT_NEED_MEMORY;
+ return sd_bus_reply_method_return(bus, message, "o", path);
}
static int bus_unit_set_transient_property(
Unit *u,
const char *name,
- DBusMessageIter *i,
+ sd_bus_message *message,
UnitSetPropertiesMode mode,
- DBusError *error) {
+ sd_bus_error *error) {
int r;
assert(u);
assert(name);
- assert(i);
+ assert(message);
if (streq(name, "Description")) {
- if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_STRING)
- return -EINVAL;
-
- if (mode != UNIT_CHECK) {
- const char *description;
+ const char *d;
- dbus_message_iter_get_basic(i, &description);
+ r = sd_bus_message_read(message, "s", &d);
+ if (r < 0)
+ return r;
- r = unit_set_description(u, description);
+ if (mode != UNIT_CHECK) {
+ r = unit_set_description(u, d);
if (r < 0)
return r;
- unit_write_drop_in_format(u, mode, name, "[Unit]\nDescription=%s\n", description);
+ unit_write_drop_in_format(u, mode, name, "[Unit]\nDescription=%s\n", d);
}
return 1;
@@ -862,10 +810,12 @@ static int bus_unit_set_transient_property(
} else if (streq(name, "Slice") && unit_get_cgroup_context(u)) {
const char *s;
- if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_STRING)
- return -EINVAL;
+ r = sd_bus_message_read(message, "s", &s);
+ if (r < 0)
+ return r;
- dbus_message_iter_get_basic(i, &s);
+ if (!unit_name_is_valid(s, false) || !endswith(s, ".slice"))
+ return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid slice name %s", s);
if (isempty(s)) {
if (mode != UNIT_CHECK) {
@@ -905,24 +855,19 @@ static int bus_unit_set_transient_property(
streq(name, "PartOf")) {
UnitDependency d;
- DBusMessageIter sub;
+ const char *other;
d = unit_dependency_from_string(name);
if (d < 0)
return -EINVAL;
- if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_ARRAY ||
- dbus_message_iter_get_element_type(i) != DBUS_TYPE_STRING)
- return -EINVAL;
-
- dbus_message_iter_recurse(i, &sub);
- while (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRING) {
- const char *other;
-
- dbus_message_iter_get_basic(&sub, &other);
+ r = sd_bus_message_enter_container(message, 'a', "s");
+ if (r < 0)
+ return r;
+ while ((r = sd_bus_message_read(message, "s", &other)) > 0) {
if (!unit_name_is_valid(other, false))
- return -EINVAL;
+ return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid unit name %s", other);
if (mode != UNIT_CHECK) {
_cleanup_free_ char *label = NULL;
@@ -938,8 +883,9 @@ static int bus_unit_set_transient_property(
unit_write_drop_in_format(u, mode, label, "[Unit]\n%s=%s\n", name, other);
}
- dbus_message_iter_next(&sub);
}
+ if (r < 0)
+ return r;
return 1;
}
@@ -949,18 +895,17 @@ static int bus_unit_set_transient_property(
int bus_unit_set_properties(
Unit *u,
- DBusMessageIter *iter,
+ sd_bus_message *message,
UnitSetPropertiesMode mode,
bool commit,
- DBusError *error) {
+ sd_bus_error *error) {
bool for_real = false;
- DBusMessageIter sub;
unsigned n = 0;
int r;
assert(u);
- assert(iter);
+ assert(message);
if (u->transient)
mode &= UNIT_RUNTIME;
@@ -970,52 +915,54 @@ int bus_unit_set_properties(
* it. This is to implement transaction-like behaviour without
* actually providing full transactions. */
- if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_ARRAY ||
- dbus_message_iter_get_element_type(iter) != DBUS_TYPE_STRUCT)
- return -EINVAL;
+ r = sd_bus_message_enter_container(message, 'a', "(sv)");
+ if (r < 0)
+ return r;
- dbus_message_iter_recurse(iter, &sub);
for (;;) {
- DBusMessageIter sub2, sub3;
const char *name;
- if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_INVALID) {
-
+ r = sd_bus_message_enter_container(message, 'r', "sv");
+ if (r < 0)
+ return r;
+ if (r == 0) {
if (for_real || mode == UNIT_CHECK)
break;
/* Reached EOF. Let's try again, and this time for realz... */
- dbus_message_iter_recurse(iter, &sub);
+ r = sd_bus_message_rewind(message, false);
+ if (r < 0)
+ return r;
for_real = true;
continue;
}
- if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT)
- return -EINVAL;
-
- dbus_message_iter_recurse(&sub, &sub2);
+ r = sd_bus_message_read(message, "s", &name);
+ if (r < 0)
+ return r;
- if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &name, true) < 0 ||
- dbus_message_iter_get_arg_type(&sub2) != DBUS_TYPE_VARIANT)
- return -EINVAL;
+ if (!UNIT_VTABLE(u)->bus_set_property)
+ return sd_bus_error_setf(error, SD_BUS_ERROR_PROPERTY_READ_ONLY, "Objects of this type do not support setting properties.");
- if (!UNIT_VTABLE(u)->bus_set_property) {
- dbus_set_error(error, DBUS_ERROR_PROPERTY_READ_ONLY, "Objects of this type do not support setting properties.");
- return -ENOENT;
- }
+ r = sd_bus_message_enter_container(message, 'v', NULL);
+ if (r < 0)
+ return r;
- dbus_message_iter_recurse(&sub2, &sub3);
- r = UNIT_VTABLE(u)->bus_set_property(u, name, &sub3, for_real ? mode : UNIT_CHECK, error);
+ r = UNIT_VTABLE(u)->bus_set_property(u, name, message, for_real ? mode : UNIT_CHECK, error);
if (r == 0 && u->transient && u->load_state == UNIT_STUB)
- r = bus_unit_set_transient_property(u, name, &sub3, for_real ? mode : UNIT_CHECK, error);
+ r = bus_unit_set_transient_property(u, name, message, for_real ? mode : UNIT_CHECK, error);
+ if (r < 0)
+ return r;
+ if (r == 0)
+ return sd_bus_error_setf(error, SD_BUS_ERROR_PROPERTY_READ_ONLY, "Cannot set property %s, or unknown property.", name);
+
+ r = sd_bus_message_exit_container(message);
if (r < 0)
return r;
- if (r == 0) {
- dbus_set_error(error, DBUS_ERROR_PROPERTY_READ_ONLY, "Cannot set property %s, or unknown property.", name);
- return -ENOENT;
- }
- dbus_message_iter_next(&sub);
+ r = sd_bus_message_exit_container(message);
+ if (r < 0)
+ return r;
n += for_real;
}
@@ -1025,76 +972,3 @@ int bus_unit_set_properties(
return n;
}
-
-const BusProperty bus_unit_properties[] = {
- { "Id", bus_property_append_string, "s", offsetof(Unit, id), true },
- { "Names", bus_unit_append_names, "as", 0 },
- { "Following", bus_unit_append_following, "s", 0 },
- { "Requires", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_REQUIRES]), true },
- { "RequiresOverridable", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_REQUIRES_OVERRIDABLE]), true },
- { "Requisite", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_REQUISITE]), true },
- { "RequisiteOverridable", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_REQUISITE_OVERRIDABLE]), true },
- { "Wants", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_WANTS]), true },
- { "BindsTo", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_BINDS_TO]), true },
- { "PartOf", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_PART_OF]), true },
- { "RequiredBy", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_REQUIRED_BY]), true },
- { "RequiredByOverridable", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_REQUIRED_BY_OVERRIDABLE]), true },
- { "WantedBy", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_WANTED_BY]), true },
- { "BoundBy", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_BOUND_BY]), true },
- { "ConsistsOf", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_CONSISTS_OF]), true },
- { "Conflicts", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_CONFLICTS]), true },
- { "ConflictedBy", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_CONFLICTED_BY]), true },
- { "Before", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_BEFORE]), true },
- { "After", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_AFTER]), true },
- { "OnFailure", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_ON_FAILURE]), true },
- { "Triggers", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_TRIGGERS]), true },
- { "TriggeredBy", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_TRIGGERED_BY]), true },
- { "PropagatesReloadTo", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_PROPAGATES_RELOAD_TO]), true },
- { "ReloadPropagatedFrom", bus_unit_append_dependencies, "as", offsetof(Unit, dependencies[UNIT_RELOAD_PROPAGATED_FROM]), true },
- { "RequiresMountsFor", bus_property_append_strv, "as", offsetof(Unit, requires_mounts_for), true },
- { "Documentation", bus_property_append_strv, "as", offsetof(Unit, documentation), true },
- { "Description", bus_unit_append_description, "s", 0 },
- { "LoadState", bus_unit_append_load_state, "s", offsetof(Unit, load_state) },
- { "ActiveState", bus_unit_append_active_state, "s", 0 },
- { "SubState", bus_unit_append_sub_state, "s", 0 },
- { "FragmentPath", bus_property_append_string, "s", offsetof(Unit, fragment_path), true },
- { "SourcePath", bus_property_append_string, "s", offsetof(Unit, source_path), true },
- { "DropInPaths", bus_property_append_strv, "as", offsetof(Unit, dropin_paths), true },
- { "UnitFileState", bus_unit_append_file_state, "s", 0 },
- { "InactiveExitTimestamp", bus_property_append_usec, "t", offsetof(Unit, inactive_exit_timestamp.realtime) },
- { "InactiveExitTimestampMonotonic", bus_property_append_usec, "t", offsetof(Unit, inactive_exit_timestamp.monotonic) },
- { "ActiveEnterTimestamp", bus_property_append_usec, "t", offsetof(Unit, active_enter_timestamp.realtime) },
- { "ActiveEnterTimestampMonotonic", bus_property_append_usec, "t", offsetof(Unit, active_enter_timestamp.monotonic) },
- { "ActiveExitTimestamp", bus_property_append_usec, "t", offsetof(Unit, active_exit_timestamp.realtime) },
- { "ActiveExitTimestampMonotonic", bus_property_append_usec, "t", offsetof(Unit, active_exit_timestamp.monotonic) },
- { "InactiveEnterTimestamp", bus_property_append_usec, "t", offsetof(Unit, inactive_enter_timestamp.realtime) },
- { "InactiveEnterTimestampMonotonic", bus_property_append_usec, "t", offsetof(Unit, inactive_enter_timestamp.monotonic) },
- { "CanStart", bus_unit_append_can_start, "b", 0 },
- { "CanStop", bus_unit_append_can_stop, "b", 0 },
- { "CanReload", bus_unit_append_can_reload, "b", 0 },
- { "CanIsolate", bus_unit_append_can_isolate, "b", 0 },
- { "Job", bus_unit_append_job, "(uo)", 0 },
- { "StopWhenUnneeded", bus_property_append_bool, "b", offsetof(Unit, stop_when_unneeded) },
- { "RefuseManualStart", bus_property_append_bool, "b", offsetof(Unit, refuse_manual_start) },
- { "RefuseManualStop", bus_property_append_bool, "b", offsetof(Unit, refuse_manual_stop) },
- { "AllowIsolate", bus_property_append_bool, "b", offsetof(Unit, allow_isolate) },
- { "DefaultDependencies", bus_property_append_bool, "b", offsetof(Unit, default_dependencies) },
- { "OnFailureIsolate", bus_property_append_bool, "b", offsetof(Unit, on_failure_isolate) },
- { "IgnoreOnIsolate", bus_property_append_bool, "b", offsetof(Unit, ignore_on_isolate) },
- { "IgnoreOnSnapshot", bus_property_append_bool, "b", offsetof(Unit, ignore_on_snapshot) },
- { "NeedDaemonReload", bus_unit_append_need_daemon_reload, "b", 0 },
- { "JobTimeoutUSec", bus_property_append_usec, "t", offsetof(Unit, job_timeout) },
- { "ConditionTimestamp", bus_property_append_usec, "t", offsetof(Unit, condition_timestamp.realtime) },
- { "ConditionTimestampMonotonic", bus_property_append_usec, "t", offsetof(Unit, condition_timestamp.monotonic) },
- { "ConditionResult", bus_property_append_bool, "b", offsetof(Unit, condition_result) },
- { "Conditions", bus_property_append_condition_list, "a(sbbsi)", offsetof(Unit, conditions) },
- { "LoadError", bus_unit_append_load_error, "(ss)", 0 },
- { "Transient", bus_property_append_bool, "b", offsetof(Unit, transient) },
- {}
-};
-
-const BusProperty bus_unit_cgroup_properties[] = {
- { "Slice", bus_unit_append_slice, "s", 0 },
- { "ControlGroup", bus_property_append_string, "s", offsetof(Unit, cgroup_path), true },
- {}
-};