X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdbus-path.c;h=8d58de398c9b16b69ca514c3602478f1de4ad247;hb=fd8bccfbf9e50a7a0a209867130aac434e0754e7;hp=ed1dc265fc67271abc76c99e754a7ffaee81bd35;hpb=01f78473b104d28db0fa813414092bc6358ae521;p=elogind.git
diff --git a/src/dbus-path.c b/src/dbus-path.c
index ed1dc265f..8d58de398 100644
--- a/src/dbus-path.c
+++ b/src/dbus-path.c
@@ -25,28 +25,59 @@
#include "dbus-path.h"
#include "dbus-execute.h"
-#define BUS_PATH_INTERFACE \
- " \n" \
- " \n" \
- " \n" \
+#define BUS_PATH_INTERFACE \
+ " \n" \
+ " \n" \
+ " \n" \
+ " \n"
#define INTROSPECTION \
DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \
"\n" \
BUS_UNIT_INTERFACE \
- BUS_PATH_INTERFACE \
+ BUS_PATH_INTERFACE \
BUS_PROPERTIES_INTERFACE \
BUS_INTROSPECTABLE_INTERFACE \
"\n"
const char bus_path_interface[] = BUS_PATH_INTERFACE;
-DBusHandlerResult bus_path_message_handler(Unit *u, DBusMessage *message) {
+static int bus_path_append_paths(Manager *m, DBusMessageIter *i, const char *property, void *data) {
+ Path *p = data;
+ DBusMessageIter sub, sub2;
+ PathSpec *k;
+
+ assert(m);
+ assert(i);
+ assert(property);
+ assert(p);
+
+ if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(ss)", &sub))
+ return -ENOMEM;
+
+ LIST_FOREACH(spec, k, p->specs) {
+ const char *t = path_type_to_string(k->type);
+
+ if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) ||
+ !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &t) ||
+ !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &k->path) ||
+ !dbus_message_iter_close_container(&sub, &sub2))
+ return -ENOMEM;
+ }
+
+ if (!dbus_message_iter_close_container(i, &sub))
+ return -ENOMEM;
+
+ return 0;
+}
+
+DBusHandlerResult bus_path_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
const BusProperty properties[] = {
BUS_UNIT_PROPERTIES,
- { "org.freedesktop.systemd1.Path", "Unit", bus_property_append_string, "s", &u->path.unit->meta.id },
+ { "org.freedesktop.systemd1.Path", "Unit", bus_property_append_string, "s", u->path.unit->meta.id },
+ { "org.freedesktop.systemd1.Path", "Paths", bus_path_append_paths, "a(ss)", u },
{ NULL, NULL, NULL, NULL, NULL }
};
- return bus_default_message_handler(u->meta.manager, message, INTROSPECTION, properties);
+ return bus_default_message_handler(u->meta.manager, c, message, INTROSPECTION, properties);
}