1 files changed, 18 insertions, 55 deletions
diff --git a/src/core/dbus-snapshot.c b/src/core/dbus-snapshot.c
index 9978df6022..a4ba588a1d 100644
--- a/src/core/dbus-snapshot.c
+++ b/src/core/dbus-snapshot.c
@@ -19,66 +19,29 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "selinux-access.h"
+#include "unit.h"
+#include "snapshot.h"
 #include "dbus-unit.h"
 #include "dbus-snapshot.h"
-#include "dbus-common.h"
-#include "selinux-access.h"
-
-#define BUS_SNAPSHOT_INTERFACE                                          \
-        " <interface name=\"org.freedesktop.systemd1.Snapshot\">\n"     \
-        "  <method name=\"Remove\"/>\n"                                 \
-        "  <property name=\"Cleanup\" type=\"b\" access=\"read\"/>\n"   \
-        " </interface>\n"
-
-#define INTROSPECTION                                                   \
-        DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE                       \
-        "<node>\n"                                                      \
-        BUS_UNIT_INTERFACE                                              \
-        BUS_SNAPSHOT_INTERFACE                                          \
-        BUS_PROPERTIES_INTERFACE                                        \
-        BUS_PEER_INTERFACE                                              \
-        BUS_INTROSPECTABLE_INTERFACE                                    \
-        "</node>\n"
-
-#define INTERFACES_LIST                              \
-        BUS_UNIT_INTERFACES_LIST                     \
-        "org.freedesktop.systemd1.Snapshot\0"
-
-const char bus_snapshot_interface[] = BUS_SNAPSHOT_INTERFACE;
-
-static const BusProperty bus_snapshot_properties[] = {
-        { "Cleanup", bus_property_append_bool, "b", offsetof(Snapshot, cleanup) },
-        { NULL, }
-};
 
-DBusHandlerResult bus_snapshot_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
-        Snapshot *s = SNAPSHOT(u);
-        _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
+int bus_snapshot_method_remove(sd_bus *bus, sd_bus_message *message, void *userdata) {
+        Snapshot *s = userdata;
 
-        if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Snapshot", "Remove")) {
+        assert(bus);
+        assert(message);
+        assert(s);
 
-                SELINUX_UNIT_ACCESS_CHECK(u, c, message, "stop");
+        SELINUX_UNIT_ACCESS_CHECK(UNIT(s), bus, message, "stop");
 
-                reply = dbus_message_new_method_return(message);
-                if (!reply)
-                        return DBUS_HANDLER_RESULT_NEED_MEMORY;
+        snapshot_remove(s);
 
-                snapshot_remove(SNAPSHOT(u));
-
-        } else {
-                const BusBoundProperties bps[] = {
-                        { "org.freedesktop.systemd1.Unit",     bus_unit_properties,     u },
-                        { "org.freedesktop.systemd1.Snapshot", bus_snapshot_properties, s },
-                        { NULL, }
-                };
-
-                SELINUX_UNIT_ACCESS_CHECK(u, c, message, "status");
-
-                return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
-        }
-
-        if (!bus_maybe_send_reply(c, message, reply))
-                return DBUS_HANDLER_RESULT_NEED_MEMORY;
-
-        return DBUS_HANDLER_RESULT_HANDLED;
+        return sd_bus_reply_method_return(bus, message, NULL);
 }
+
+const sd_bus_vtable bus_snapshot_vtable[] = {
+        SD_BUS_VTABLE_START(0),
+        SD_BUS_METHOD("Remove", NULL, NULL, bus_snapshot_method_remove, 0),
+        SD_BUS_PROPERTY("Cleanup", "b", bus_property_get_bool, offsetof(Snapshot, cleanup), 0),
+        SD_BUS_VTABLE_END
+};