X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dbus-unit.c;h=1c6b405adf3abd5120c80233e88a33a3370e8ebc;hb=47be870bd83fb3719dffc3ee9348a409ab762a14;hp=0bdf162023ac57c4c2d1815ea0388f02002cb6b5;hpb=86ad3bc1ce5a6e4d007aaa390f6f7551ff7c9696;p=elogind.git

diff --git a/dbus-unit.c b/dbus-unit.c
index 0bdf16202..1c6b405ad 100644
--- a/dbus-unit.c
+++ b/dbus-unit.c
@@ -1,5 +1,24 @@
 /*-*- Mode: C; c-basic-offset: 8 -*-*/
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
 #include <errno.h>
 
 #include "dbus.h"
@@ -8,8 +27,23 @@
 static const char introspection[] =
         DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
         "<node>"
-        " <!-- you suck -->"
         " <interface name=\"org.freedesktop.systemd1.Unit\">"
+        "  <method name=\"Start\">"
+        "   <arg name=\"mode\" type=\"s\" direction=\"in\"/>"
+        "   <arg name=\"job\" type=\"o\" direction=\"out\"/>"
+        "  </method>"
+        "  <method name=\"Stop\">"
+        "   <arg name=\"mode\" type=\"s\" direction=\"in\"/>"
+        "   <arg name=\"job\" type=\"o\" direction=\"out\"/>"
+        "  </method>"
+        "  <method name=\"Restart\">"
+        "   <arg name=\"mode\" type=\"s\" direction=\"in\"/>"
+        "   <arg name=\"job\" type=\"o\" direction=\"out\"/>"
+        "  </method>"
+        "  <method name=\"Reload\">"
+        "   <arg name=\"mode\" type=\"s\" direction=\"in\"/>"
+        "   <arg name=\"job\" type=\"o\" direction=\"out\"/>"
+        "  </method>"
         "  <property name=\"Id\" type=\"s\" access=\"read\"/>"
         "  <property name=\"Description\" type=\"s\" access=\"read\"/>"
         "  <property name=\"LoadState\" type=\"s\" access=\"read\"/>"
@@ -191,7 +225,73 @@ static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusMessage *message
                 { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(u->meta.manager, message, introspection, properties);
+        DBusMessage *reply = NULL;
+        Manager *m = u->meta.manager;
+        DBusError error;
+        JobType job_type = _JOB_TYPE_INVALID;
+
+        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
+                return bus_default_message_handler(u->meta.manager, message, introspection, properties);
+
+        if (job_type != _JOB_TYPE_INVALID) {
+                const char *smode;
+                JobMode mode;
+                Job *j;
+                int r;
+                char *path;
+
+                if (!dbus_message_get_args(
+                                    message,
+                                    &error,
+                                    DBUS_TYPE_STRING, &smode,
+                                    DBUS_TYPE_INVALID))
+                        return bus_send_error_reply(m, message, &error, -EINVAL);
+
+                if ((mode = job_mode_from_string(smode)) == _JOB_MODE_INVALID)
+                        return bus_send_error_reply(m, message, NULL, -EINVAL);
+
+                if ((r = manager_add_job(m, job_type, u, mode, true, &j)) < 0)
+                        return bus_send_error_reply(m, message, NULL, r);
+
+                if (!(reply = dbus_message_new_method_return(message)))
+                        goto oom;
+
+                if (!(path = job_dbus_path(j)))
+                        goto oom;
+
+                if (!dbus_message_append_args(
+                                    reply,
+                                    DBUS_TYPE_OBJECT_PATH, &path,
+                                    DBUS_TYPE_INVALID))
+                        goto oom;
+        }
+
+        if (reply) {
+                if (!dbus_connection_send(m->bus, reply, NULL))
+                        goto oom;
+
+                dbus_message_unref(reply);
+        }
+
+        return DBUS_HANDLER_RESULT_HANDLED;
+
+oom:
+        if (reply)
+                dbus_message_unref(reply);
+
+        dbus_error_free(&error);
+
+        return DBUS_HANDLER_RESULT_NEED_MEMORY;
 }
 
 static DBusHandlerResult bus_unit_message_handler(DBusConnection  *connection, DBusMessage  *message, void *data) {