X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-timer.c;h=4082f7f9b996829a60197dcb50304d30e09fd3f9;hb=112a7f4696ebb96abdb42df62e1e794e903f66b3;hp=c76c2e0500bff23b49f04eb3530d3e273004f516;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git

diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index c76c2e050..4082f7f9b 100644
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -25,12 +25,15 @@
 #include "dbus-timer.h"
 #include "dbus-execute.h"
 #include "dbus-common.h"
+#include "selinux-access.h"
 
 #define BUS_TIMER_INTERFACE                                             \
         " <interface name=\"org.freedesktop.systemd1.Timer\">\n"        \
         "  <property name=\"Unit\" type=\"s\" access=\"read\"/>\n"      \
-        "  <property name=\"Timers\" type=\"a(stt)\" access=\"read\"/>\n" \
-        "  <property name=\"NextElapseUSec\" type=\"t\" access=\"read\"/>\n" \
+        "  <property name=\"TimersMonotonic\" type=\"a(stt)\" access=\"read\"/>\n" \
+        "  <property name=\"TimersCalendar\" type=\"a(sst)\" access=\"read\"/>\n" \
+        "  <property name=\"NextElapseUSecRealtime\" type=\"t\" access=\"read\"/>\n" \
+        "  <property name=\"NextElapseUSecMonotonic\" type=\"t\" access=\"read\"/>\n" \
         "  <property name=\"Result\" type=\"s\" access=\"read\"/>\n"    \
         " </interface>\n"
 
@@ -51,11 +54,13 @@
 const char bus_timer_interface[] _introspect_("Timer") = BUS_TIMER_INTERFACE;
 
 const char bus_timer_invalidating_properties[] =
-        "Timers\0"
-        "NextElapseUSec\0"
+        "TimersMonotonic\0"
+        "TimersRealtime\0"
+        "NextElapseUSecRealtime\0"
+        "NextElapseUSecMonotonic\0"
         "Result\0";
 
-static int bus_timer_append_timers(DBusMessageIter *i, const char *property, void *data) {
+static int bus_timer_append_monotonic_timers(DBusMessageIter *i, const char *property, void *data) {
         Timer *p = data;
         DBusMessageIter sub, sub2;
         TimerValue *k;
@@ -68,17 +73,21 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi
                 return -ENOMEM;
 
         LIST_FOREACH(value, k, p->values) {
-                char *buf;
+                _cleanup_free_ char *buf = NULL;
                 const char *t;
                 size_t l;
                 bool b;
 
+                if (k->base == TIMER_CALENDAR)
+                        continue;
+
                 t = timer_base_to_string(k->base);
                 assert(endswith(t, "Sec"));
 
                 /* s/Sec/USec/ */
                 l = strlen(t);
-                if (!(buf = new(char, l+2)))
+                buf = new(char, l+2);
+                if (!buf)
                         return -ENOMEM;
 
                 memcpy(buf, t, l-3);
@@ -90,7 +99,48 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi
                         dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &k->next_elapse) &&
                         dbus_message_iter_close_container(&sub, &sub2);
 
-                free(buf);
+                if (!b)
+                        return -ENOMEM;
+        }
+
+        if (!dbus_message_iter_close_container(i, &sub))
+                return -ENOMEM;
+
+        return 0;
+}
+
+static int bus_timer_append_calendar_timers(DBusMessageIter *i, const char *property, void *data) {
+        Timer *p = data;
+        DBusMessageIter sub, sub2;
+        TimerValue *k;
+
+        assert(i);
+        assert(property);
+        assert(p);
+
+        if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(sst)", &sub))
+                return -ENOMEM;
+
+        LIST_FOREACH(value, k, p->values) {
+                _cleanup_free_ char *buf = NULL;
+                const char *t;
+                bool b;
+                int j;
+
+                if (k->base != TIMER_CALENDAR)
+                        continue;
+
+                t = timer_base_to_string(k->base);
+                j = calendar_spec_to_string(k->calendar_spec, &buf);
+                if (j < 0)
+                        return j;
+
+                b = 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, &buf) &&
+                        dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &k->next_elapse) &&
+                        dbus_message_iter_close_container(&sub, &sub2);
+
                 if (!b)
                         return -ENOMEM;
         }
@@ -102,15 +152,15 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi
 }
 
 static int bus_timer_append_unit(DBusMessageIter *i, const char *property, void *data) {
-        Unit *u = data;
-        Timer *timer = TIMER(u);
+        Unit *u = data, *trigger;
         const char *t;
 
         assert(i);
         assert(property);
         assert(u);
 
-        t = UNIT_DEREF(timer->unit) ? UNIT_DEREF(timer->unit)->id : "";
+        trigger = UNIT_TRIGGER(u);
+        t = trigger ? trigger->id : "";
 
         return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM;
 }
@@ -118,10 +168,12 @@ static int bus_timer_append_unit(DBusMessageIter *i, const char *property, void
 static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_timer_append_timer_result, timer_result, TimerResult);
 
 static const BusProperty bus_timer_properties[] = {
-        { "Unit",           bus_timer_append_unit,        "s", 0 },
-        { "Timers",         bus_timer_append_timers, "a(stt)", 0 },
-        { "NextElapseUSec", bus_property_append_usec,     "t", offsetof(Timer, next_elapse) },
-        { "Result",         bus_timer_append_timer_result,"s", offsetof(Timer, result)      },
+        { "Unit",                    bus_timer_append_unit,             "s",      0 },
+        { "TimersMonotonic",         bus_timer_append_monotonic_timers, "a(stt)", 0 },
+        { "TimersCalendar",          bus_timer_append_calendar_timers,  "a(sst)", 0 },
+        { "NextElapseUSecMonotonic", bus_property_append_usec,          "t",      offsetof(Timer, next_elapse_monotonic) },
+        { "NextElapseUSecRealtime",  bus_property_append_usec,          "t",      offsetof(Timer, next_elapse_realtime) },
+        { "Result",                  bus_timer_append_timer_result,     "s",      offsetof(Timer, result) },
         { NULL, }
 };
 
@@ -133,5 +185,7 @@ DBusHandlerResult bus_timer_message_handler(Unit *u, DBusConnection *c, DBusMess
                 { NULL, }
         };
 
+        SELINUX_UNIT_ACCESS_CHECK(u, c, message, "status");
+
         return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
 }