X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdbus-timer.c;h=d548227b5ae31ef419f6f0b4e47455f9fef019f7;hb=14ad1d1437f51b8ebc8dc6e8d3707b41d48d0a3a;hp=68bd8a44899cec4ac0033f97f35fbb55b891d96b;hpb=5e8d1c9a9f15b7453474dc4879bdb4021c3f50a1;p=elogind.git
diff --git a/src/dbus-timer.c b/src/dbus-timer.c
index 68bd8a448..d548227b5 100644
--- a/src/dbus-timer.c
+++ b/src/dbus-timer.c
@@ -27,8 +27,10 @@
#define BUS_TIMER_INTERFACE \
" \n" \
- " \n" \
- " \n" \
+ " \n" \
+ " \n" \
+ " \n" \
+ " \n"
#define INTROSPECTION \
DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \
@@ -41,10 +43,42 @@
const char bus_timer_interface[] = BUS_TIMER_INTERFACE;
+static int bus_timer_append_timers(Manager *m, DBusMessageIter *i, const char *property, void *data) {
+ Timer *p = data;
+ DBusMessageIter sub, sub2;
+ TimerValue *k;
+
+ assert(m);
+ assert(i);
+ assert(property);
+ assert(p);
+
+ if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(stt)", &sub))
+ return -ENOMEM;
+
+ LIST_FOREACH(value, k, p->values) {
+ const char *t = timer_base_to_string(k->base);
+
+ 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_UINT64, &k->value) ||
+ !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &k->next_elapse) ||
+ !dbus_message_iter_close_container(&sub, &sub2))
+ return -ENOMEM;
+ }
+
+ if (!dbus_message_iter_close_container(i, &sub))
+ return -ENOMEM;
+
+ return 0;
+}
+
DBusHandlerResult bus_timer_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
const BusProperty properties[] = {
BUS_UNIT_PROPERTIES,
- { "org.freedesktop.systemd1.Timer", "Unit", bus_property_append_string, "s", &u->timer.unit->meta.id },
+ { "org.freedesktop.systemd1.Timer", "Unit", bus_property_append_string, "s", u->timer.unit->meta.id },
+ { "org.freedesktop.systemd1.Timer", "Timers", bus_timer_append_timers, "a(stt)", u },
+ { "org.freedesktop.systemd1.Timer", "NextElapse", bus_property_append_usec, "t", &u->timer.next_elapse },
{ NULL, NULL, NULL, NULL, NULL }
};