X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftimedate%2Ftimedated.c;h=0641f3955167e0f008d5967848f977a1d9007ff9;hp=3fef9e8844bc09225b3dab162c597d71004737d3;hb=e7176abbe818c75c6acd90227a7a84c3e05fee31;hpb=669241a076108e0483d7d8475beaa506106d077e
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 3fef9e884..0641f3955 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -19,80 +19,52 @@
along with systemd; If not, see .
***/
-#include
-
#include
#include
#include
+#include "sd-id128.h"
+#include "sd-messages.h"
+#include "sd-event.h"
+#include "sd-bus.h"
+
#include "util.h"
#include "strv.h"
-#include "dbus-common.h"
-#include "polkit.h"
#include "def.h"
#include "hwclock.h"
#include "conf-files.h"
+#include "path-util.h"
+#include "fileio-label.h"
+#include "label.h"
+#include "bus-util.h"
+#include "event-util.h"
#define NULL_ADJTIME_UTC "0.0 0 0\n0\nUTC\n"
#define NULL_ADJTIME_LOCAL "0.0 0 0\n0\nLOCAL\n"
-#define INTERFACE \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n"
-
-#define INTROSPECTION \
- DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \
- "\n" \
- INTERFACE \
- BUS_PROPERTIES_INTERFACE \
- BUS_INTROSPECTABLE_INTERFACE \
- BUS_PEER_INTERFACE \
- "\n"
-
-#define INTERFACES_LIST \
- BUS_GENERIC_INTERFACES_LIST \
- "org.freedesktop.timedate1\0"
-
-const char timedate_interface[] _introspect_("timedate1") = INTERFACE;
-
-typedef struct TZ {
+typedef struct Context {
char *zone;
bool local_rtc;
- int use_ntp;
-} TZ;
+ unsigned can_ntp;
+ unsigned use_ntp;
+ Hashmap *polkit_registry;
+} Context;
-static TZ tz = {
- .use_ntp = -1,
-};
+static void context_reset(Context *c) {
+ assert(c);
-static usec_t remain_until;
+ free(c->zone);
+ c->zone = NULL;
-static void free_data(void) {
- free(tz.zone);
- tz.zone = NULL;
+ c->local_rtc = false;
+ c->can_ntp = c->use_ntp = -1;
+}
- tz.local_rtc = false;
+static void context_free(Context *c, sd_bus *bus) {
+ assert(c);
+
+ context_reset(c);
+ bus_verify_polkit_async_registry_free(bus, c->polkit_registry);
}
static bool valid_timezone(const char *name) {
@@ -143,110 +115,85 @@ static bool valid_timezone(const char *name) {
return true;
}
-static void verify_timezone(void) {
- char *p, *a = NULL, *b = NULL;
- size_t l, q;
- int j, k;
-
- if (!tz.zone)
- return;
-
- p = strappend("/usr/share/zoneinfo/", tz.zone);
- if (!p) {
- log_error("Out of memory.");
- return;
- }
-
- j = read_full_file("/etc/localtime", &a, &l);
- k = read_full_file(p, &b, &q);
-
- free(p);
-
- if (j < 0 || k < 0 || l != q || memcmp(a, b, l)) {
- log_warning("/etc/localtime and /etc/timezone out of sync.");
- free(tz.zone);
- tz.zone = NULL;
- }
-
- free(a);
- free(b);
-}
-
-static int read_data(void) {
+static int context_read_data(Context *c) {
+ _cleanup_free_ char *t = NULL;
int r;
- free_data();
+ assert(c);
- r = read_one_line_file("/etc/timezone", &tz.zone);
+ context_reset(c);
+
+ r = readlink_malloc("/etc/localtime", &t);
if (r < 0) {
- if (r != -ENOENT)
- log_warning("Failed to read /etc/timezone: %s", strerror(-r));
+ if (r == -EINVAL)
+ log_warning("/etc/localtime should be a symbolic link to a timezone data file in /usr/share/zoneinfo/.");
+ else
+ log_warning("Failed to get target of /etc/localtime: %s", strerror(-r));
+ } else {
+ const char *e;
-#ifdef TARGET_FEDORA
- r = parse_env_file("/etc/sysconfig/clock", NEWLINE,
- "ZONE", &tz.zone,
- NULL);
+ e = path_startswith(t, "/usr/share/zoneinfo/");
+ if (!e)
+ e = path_startswith(t, "../usr/share/zoneinfo/");
- if (r < 0 && r != -ENOENT)
- log_warning("Failed to read /etc/sysconfig/clock: %s", strerror(-r));
-#endif
- }
+ if (!e)
+ log_warning("/etc/localtime should be a symbolic link to a timezone data file in /usr/share/zoneinfo/.");
+ else {
+ c->zone = strdup(e);
+ if (!c->zone)
+ return log_oom();
- if (isempty(tz.zone)) {
- free(tz.zone);
- tz.zone = NULL;
+ goto have_timezone;
+ }
}
- verify_timezone();
+have_timezone:
+ if (isempty(c->zone)) {
+ free(c->zone);
+ c->zone = NULL;
+ }
- tz.local_rtc = hwclock_is_localtime() > 0;
+ c->local_rtc = hwclock_is_localtime() > 0;
return 0;
}
-static int write_data_timezone(void) {
+static int context_write_data_timezone(Context *c) {
+ _cleanup_free_ char *p = NULL;
int r = 0;
- char *p;
- if (!tz.zone) {
- if (unlink("/etc/timezone") < 0 && errno != ENOENT)
- r = -errno;
+ assert(c);
+ if (isempty(c->zone)) {
if (unlink("/etc/localtime") < 0 && errno != ENOENT)
r = -errno;
return r;
}
- p = strappend("/usr/share/zoneinfo/", tz.zone);
- if (!p) {
- log_error("Out of memory.");
- return -ENOMEM;
- }
-
- r = symlink_or_copy_atomic(p, "/etc/localtime");
- free(p);
-
- if (r < 0)
- return r;
+ p = strappend("../usr/share/zoneinfo/", c->zone);
+ if (!p)
+ return log_oom();
- r = write_one_line_file_atomic("/etc/timezone", tz.zone);
+ r = symlink_atomic(p, "/etc/localtime");
if (r < 0)
return r;
return 0;
}
-static int write_data_local_rtc(void) {
+static int context_write_data_local_rtc(Context *c) {
int r;
- char *s, *w;
+ _cleanup_free_ char *s = NULL, *w = NULL;
+
+ assert(c);
r = read_full_file("/etc/adjtime", &s, NULL);
if (r < 0) {
if (r != -ENOENT)
return r;
- if (!tz.local_rtc)
+ if (!c->local_rtc)
return 0;
w = strdup(NULL_ADJTIME_LOCAL);
@@ -257,58 +204,46 @@ static int write_data_local_rtc(void) {
size_t a, b;
p = strchr(s, '\n');
- if (!p) {
- free(s);
+ if (!p)
return -EIO;
- }
p = strchr(p+1, '\n');
- if (!p) {
- free(s);
+ if (!p)
return -EIO;
- }
p++;
e = strchr(p, '\n');
- if (!e) {
- free(s);
+ if (!e)
return -EIO;
- }
a = p - s;
b = strlen(e);
- w = new(char, a + (tz.local_rtc ? 5 : 3) + b + 1);
- if (!w) {
- free(s);
+ w = new(char, a + (c->local_rtc ? 5 : 3) + b + 1);
+ if (!w)
return -ENOMEM;
- }
- *(char*) mempcpy(stpcpy(mempcpy(w, s, a), tz.local_rtc ? "LOCAL" : "UTC"), e, b) = 0;
+ *(char*) mempcpy(stpcpy(mempcpy(w, s, a), c->local_rtc ? "LOCAL" : "UTC"), e, b) = 0;
if (streq(w, NULL_ADJTIME_UTC)) {
- free(w);
-
- if (unlink("/etc/adjtime") < 0) {
+ if (unlink("/etc/adjtime") < 0)
if (errno != ENOENT)
return -errno;
- }
return 0;
}
}
- r = write_one_line_file_atomic("/etc/adjtime", w);
- free(w);
-
- return r;
+ label_init("/etc");
+ return write_string_file_atomic_label("/etc/adjtime", w);
}
static char** get_ntp_services(void) {
- char **r = NULL, **files, **i;
+ _cleanup_strv_free_ char **r = NULL, **files = NULL;
+ char **i;
int k;
- k = conf_files_list(&files, ".list",
+ k = conf_files_list(&files, ".list", NULL,
"/etc/systemd/ntp-units.d",
"/run/systemd/ntp-units.d",
"/usr/local/lib/systemd/ntp-units.d",
@@ -318,14 +253,14 @@ static char** get_ntp_services(void) {
return NULL;
STRV_FOREACH(i, files) {
- FILE *f;
+ _cleanup_fclose_ FILE *f;
f = fopen(*i, "re");
if (!f)
continue;
for (;;) {
- char line[PATH_MAX], *l, **q;
+ char line[PATH_MAX], *l;
if (!fgets(line, sizeof(line), f)) {
@@ -339,646 +274,547 @@ static char** get_ntp_services(void) {
if (l[0] == 0 || l[0] == '#')
continue;
- q = strv_append(r, l);
- if (!q) {
- log_error("Out of memory.");
- break;
+ if (strv_extend(&r, l) < 0) {
+ log_oom();
+ return NULL;
}
-
- strv_free(r);
- r = q;
}
-
- fclose(f);
}
- strv_free(files);
+ i = r;
+ r = NULL; /* avoid cleanup */
- return strv_uniq(r);
+ return strv_uniq(i);
}
-static int read_ntp(DBusConnection *bus) {
- DBusMessage *m = NULL, *reply = NULL;
- DBusError error;
+static int context_read_ntp(Context *c, sd_bus *bus) {
+ _cleanup_strv_free_ char **l;
+ char **i;
int r;
- char **i, **l;
+ assert(c);
assert(bus);
- dbus_error_init(&error);
-
l = get_ntp_services();
STRV_FOREACH(i, l) {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ sd_bus_message *reply = NULL;
const char *s;
- if (m)
- dbus_message_unref(m);
- m = dbus_message_new_method_call(
+ r = sd_bus_call_method(
+ bus,
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
"org.freedesktop.systemd1.Manager",
- "GetUnitFileState");
- if (!m) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto finish;
- }
+ "GetUnitFileState",
+ &error,
+ &reply,
+ "s",
+ *i);
- if (!dbus_message_append_args(m,
- DBUS_TYPE_STRING, i,
- DBUS_TYPE_INVALID)) {
- log_error("Could not append arguments to message.");
- r = -ENOMEM;
- goto finish;
- }
-
- if (reply)
- dbus_message_unref(reply);
- reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
- if (!reply) {
- if (streq(error.name, "org.freedesktop.DBus.Error.FileNotFound")) {
- /* This implementation does not exist, try next one */
- dbus_error_free(&error);
+ if (r < 0) {
+ /* This implementation does not exist, try next one */
+ if (sd_bus_error_has_name(&error, SD_BUS_ERROR_FILE_NOT_FOUND))
continue;
- }
- log_error("Failed to issue method call: %s", bus_error_message(&error));
- r = -EIO;
- goto finish;
+ return r;
}
- if (!dbus_message_get_args(reply, &error,
- DBUS_TYPE_STRING, &s,
- DBUS_TYPE_INVALID)) {
- log_error("Failed to parse reply: %s", bus_error_message(&error));
- r = -EIO;
- goto finish;
- }
+ r = sd_bus_message_read(reply, "s", &s);
+ if (r < 0)
+ return r;
- tz.use_ntp =
+ c->can_ntp = 1;
+ c->use_ntp =
streq(s, "enabled") ||
streq(s, "enabled-runtime");
- r = 0;
- goto finish;
+
+ return 0;
}
/* NTP is not installed. */
- tz.use_ntp = 0;
- r = 0;
-
-finish:
- if (m)
- dbus_message_unref(m);
-
- if (reply)
- dbus_message_unref(reply);
-
- strv_free(l);
-
- dbus_error_free(&error);
+ c->can_ntp = 0;
+ c->use_ntp = 0;
- return r;
+ return 0;
}
-static int start_ntp(DBusConnection *bus, DBusError *error) {
- DBusMessage *m = NULL, *reply = NULL;
- const char *mode = "replace";
- char **i, **l;
+static int context_start_ntp(Context *c, sd_bus *bus, sd_bus_error *error) {
+ _cleanup_strv_free_ char **l = NULL;
+ char **i;
int r;
+ assert(c);
assert(bus);
assert(error);
l = get_ntp_services();
STRV_FOREACH(i, l) {
- if (m)
- dbus_message_unref(m);
- m = dbus_message_new_method_call(
- "org.freedesktop.systemd1",
- "/org/freedesktop/systemd1",
- "org.freedesktop.systemd1.Manager",
- tz.use_ntp ? "StartUnit" : "StopUnit");
- if (!m) {
- log_error("Could not allocate message.");
- r = -ENOMEM;
- goto finish;
- }
- if (!dbus_message_append_args(m,
- DBUS_TYPE_STRING, i,
- DBUS_TYPE_STRING, &mode,
- DBUS_TYPE_INVALID)) {
- log_error("Could not append arguments to message.");
- r = -ENOMEM;
- goto finish;
- }
+ if (c->use_ntp)
+ r = sd_bus_call_method(
+ bus,
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1",
+ "org.freedesktop.systemd1.Manager",
+ "StartUnit",
+ error,
+ NULL,
+ "ss", *i, "replace");
+ else
+ r = sd_bus_call_method(
+ bus,
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1",
+ "org.freedesktop.systemd1.Manager",
+ "StopUnit",
+ error,
+ NULL,
+ "ss", *i, "replace");
- if (reply)
- dbus_message_unref(reply);
- reply = dbus_connection_send_with_reply_and_block(bus, m, -1, error);
- if (!reply) {
- if (streq(error->name, "org.freedesktop.DBus.Error.FileNotFound") ||
- streq(error->name, "org.freedesktop.systemd1.LoadFailed") ||
- streq(error->name, "org.freedesktop.systemd1.NoSuchUnit")) {
+ if (r < 0) {
+ if (sd_bus_error_has_name(error, SD_BUS_ERROR_FILE_NOT_FOUND) ||
+ sd_bus_error_has_name(error, "org.freedesktop.systemd1.LoadFailed") ||
+ sd_bus_error_has_name(error, "org.freedesktop.systemd1.NoSuchUnit")) {
/* This implementation does not exist, try next one */
- dbus_error_free(error);
+ sd_bus_error_free(error);
continue;
}
- log_error("Failed to issue method call: %s", bus_error_message(error));
- r = -EIO;
- goto finish;
+ return r;
}
- r = 0;
- goto finish;
+ return 1;
}
- /* No implementaiton available... */
- r = -ENOENT;
-
-finish:
- if (m)
- dbus_message_unref(m);
-
- if (reply)
- dbus_message_unref(reply);
-
- strv_free(l);
-
- return r;
+ sd_bus_error_set_const(error, "org.freedesktop.timedate1.NoNTPSupport", "NTP not supported.");
+ return -ENOTSUP;
}
-static int enable_ntp(DBusConnection *bus, DBusError *error) {
- DBusMessage *m = NULL, *reply = NULL;
+static int context_enable_ntp(Context*c, sd_bus *bus, sd_bus_error *error) {
+ _cleanup_strv_free_ char **l = NULL;
+ char **i;
int r;
- DBusMessageIter iter;
- dbus_bool_t f = FALSE, t = TRUE;
- char **i, **l;
+ assert(c);
assert(bus);
assert(error);
l = get_ntp_services();
STRV_FOREACH(i, l) {
- char* k[2];
-
- if (m)
- dbus_message_unref(m);
- m = dbus_message_new_method_call(
- "org.freedesktop.systemd1",
- "/org/freedesktop/systemd1",
- "org.freedesktop.systemd1.Manager",
- tz.use_ntp ? "EnableUnitFiles" : "DisableUnitFiles");
- if (!m) {
- log_error("Could not allocate message.");
- r = -ENOMEM;
- goto finish;
- }
+ if (c->use_ntp)
+ r = sd_bus_call_method(
+ bus,
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1",
+ "org.freedesktop.systemd1.Manager",
+ "EnableUnitFiles",
+ error,
+ NULL,
+ "asbb", 1, *i, false, true);
+ else
+ r = sd_bus_call_method(
+ bus,
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1",
+ "org.freedesktop.systemd1.Manager",
+ "DisableUnitFiles",
+ error,
+ NULL,
+ "asb", 1, *i, false);
- dbus_message_iter_init_append(m, &iter);
-
- k[0] = *i;
- k[1] = NULL;
-
- r = bus_append_strv_iter(&iter, k);
if (r < 0) {
- log_error("Failed to append unit files.");
- goto finish;
- }
-
- /* send runtime bool */
- if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &f)) {
- log_error("Failed to append runtime boolean.");
- r = -ENOMEM;
- goto finish;
- }
-
- if (tz.use_ntp) {
- /* send force bool */
- if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &t)) {
- log_error("Failed to append force boolean.");
- r = -ENOMEM;
- goto finish;
- }
- }
-
- if (reply)
- dbus_message_unref(reply);
- reply = dbus_connection_send_with_reply_and_block(bus, m, -1, error);
- if (!reply) {
- if (streq(error->name, "org.freedesktop.DBus.Error.FileNotFound")) {
+ if (sd_bus_error_has_name(error, SD_BUS_ERROR_FILE_NOT_FOUND)) {
/* This implementation does not exist, try next one */
- dbus_error_free(error);
+ sd_bus_error_free(error);
continue;
}
- log_error("Failed to issue method call: %s", bus_error_message(error));
- r = -EIO;
- goto finish;
+ return r;
}
- dbus_message_unref(m);
- m = dbus_message_new_method_call(
+ r = sd_bus_call_method(
+ bus,
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
"org.freedesktop.systemd1.Manager",
- "Reload");
- if (!m) {
- log_error("Could not allocate message.");
- r = -ENOMEM;
- goto finish;
- }
-
- dbus_message_unref(reply);
- reply = dbus_connection_send_with_reply_and_block(bus, m, -1, error);
- if (!reply) {
- log_error("Failed to issue method call: %s", bus_error_message(error));
- r = -EIO;
- goto finish;
- }
+ "Reload",
+ error,
+ NULL,
+ NULL);
+ if (r < 0)
+ return r;
- r = 0;
- goto finish;
+ return 1;
}
- r = -ENOENT;
+ sd_bus_error_set_const(error, "org.freedesktop.timedate1.NoNTPSupport", "NTP not supported.");
+ return -ENOTSUP;
+}
-finish:
- if (m)
- dbus_message_unref(m);
+static int property_get_rtc_time(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ void *userdata,
+ sd_bus_error *error) {
+
+ struct tm tm;
+ usec_t t;
+ int r;
- if (reply)
- dbus_message_unref(reply);
+ zero(tm);
+ r = hwclock_get_time(&tm);
+ if (r == -EBUSY) {
+ log_warning("/dev/rtc is busy, is somebody keeping it open continously? That's not a good idea... Returning a bogus RTC timestamp.");
+ t = 0;
+ } else if (r < 0)
+ return sd_bus_error_set_errnof(error, r, "Failed to read RTC: %s", strerror(-r));
+ else
+ t = (usec_t) timegm(&tm) * USEC_PER_SEC;
+
+ return sd_bus_message_append(reply, "t", t);
+}
- strv_free(l);
+static int property_get_time(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ void *userdata,
+ sd_bus_error *error) {
- return r;
+ return sd_bus_message_append(reply, "t", now(CLOCK_REALTIME));
}
-static int property_append_ntp(DBusMessageIter *i, const char *property, void *data) {
- dbus_bool_t db;
+static int property_get_ntp_sync(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ void *userdata,
+ sd_bus_error *error) {
- assert(i);
- assert(property);
+ return sd_bus_message_append(reply, "b", ntp_synced());
+}
- db = tz.use_ntp > 0;
+static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) {
+ Context *c = userdata;
+ const char *z;
+ int interactive;
+ char *t;
+ int r;
+
+ assert(bus);
+ assert(m);
+ assert(c);
- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &db))
+ r = sd_bus_message_read(m, "sb", &z, &interactive);
+ if (r < 0)
+ return r;
+
+ if (!valid_timezone(z))
+ return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid time zone '%s'", z);
+
+ if (streq_ptr(z, c->zone))
+ return sd_bus_reply_method_return(m, NULL);
+
+ r = bus_verify_polkit_async(bus, &c->polkit_registry, m, "org.freedesktop.timedate1.set-timezone", interactive, error, method_set_timezone, c);
+ if (r < 0)
+ return r;
+ if (r == 0)
+ return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
+
+ t = strdup(z);
+ if (!t)
return -ENOMEM;
- return 0;
-}
+ free(c->zone);
+ c->zone = t;
-static const BusProperty bus_timedate_properties[] = {
- { "Timezone", bus_property_append_string, "s", offsetof(TZ, zone), true },
- { "LocalRTC", bus_property_append_bool, "b", offsetof(TZ, local_rtc) },
- { "NTP", property_append_ntp, "b", offsetof(TZ, use_ntp) },
- { NULL, }
-};
+ /* 1. Write new configuration file */
+ r = context_write_data_timezone(c);
+ if (r < 0) {
+ log_error("Failed to set timezone: %s", strerror(-r));
+ return sd_bus_error_set_errnof(error, r, "Failed to set timezone: %s", strerror(-r));
+ }
-static const BusBoundProperties bps[] = {
- { "org.freedesktop.timedate1", bus_timedate_properties, &tz },
- { NULL, }
-};
+ /* 2. Tell the kernel our timezone */
+ hwclock_set_timezone(NULL);
-static DBusHandlerResult timedate_message_handler(
- DBusConnection *connection,
- DBusMessage *message,
- void *userdata) {
+ if (c->local_rtc) {
+ struct timespec ts;
+ struct tm *tm;
- DBusMessage *reply = NULL, *changed = NULL;
- DBusError error;
- int r;
+ /* 3. Sync RTC from system clock, with the new delta */
+ assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0);
+ assert_se(tm = localtime(&ts.tv_sec));
+ hwclock_set_time(tm);
+ }
- assert(connection);
- assert(message);
+ log_struct(LOG_INFO,
+ MESSAGE_ID(SD_MESSAGE_TIMEZONE_CHANGE),
+ "TIMEZONE=%s", c->zone,
+ "MESSAGE=Changed timezone to '%s'.", c->zone,
+ NULL);
- dbus_error_init(&error);
+ sd_bus_emit_properties_changed(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", "Timezone", NULL);
- if (dbus_message_is_method_call(message, "org.freedesktop.timedate1", "SetTimezone")) {
- const char *z;
- dbus_bool_t interactive;
+ return sd_bus_reply_method_return(m, NULL);
+}
- if (!dbus_message_get_args(
- message,
- &error,
- DBUS_TYPE_STRING, &z,
- DBUS_TYPE_BOOLEAN, &interactive,
- DBUS_TYPE_INVALID))
- return bus_send_error_reply(connection, message, &error, -EINVAL);
+static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) {
+ int lrtc, fix_system, interactive;
+ Context *c = userdata;
+ struct timespec ts;
+ int r;
- if (!valid_timezone(z))
- return bus_send_error_reply(connection, message, NULL, -EINVAL);
+ assert(bus);
+ assert(m);
+ assert(c);
- if (!streq_ptr(z, tz.zone)) {
- char *t;
+ r = sd_bus_message_read(m, "bbb", &lrtc, &fix_system, &interactive);
+ if (r < 0)
+ return r;
- r = verify_polkit(connection, message, "org.freedesktop.timedate1.set-timezone", interactive, NULL, &error);
- if (r < 0)
- return bus_send_error_reply(connection, message, &error, r);
+ if (lrtc == c->local_rtc)
+ return sd_bus_reply_method_return(m, NULL);
- t = strdup(z);
- if (!t)
- goto oom;
+ r = bus_verify_polkit_async(bus, &c->polkit_registry, m, "org.freedesktop.timedate1.set-local-rtc", interactive, error, method_set_local_rtc, c);
+ if (r < 0)
+ return r;
+ if (r == 0)
+ return 1;
- free(tz.zone);
- tz.zone = t;
+ c->local_rtc = lrtc;
- /* 1. Write new configuration file */
- r = write_data_timezone();
- if (r < 0) {
- log_error("Failed to set timezone: %s", strerror(-r));
- return bus_send_error_reply(connection, message, NULL, r);
- }
+ /* 1. Write new configuration file */
+ r = context_write_data_local_rtc(c);
+ if (r < 0) {
+ log_error("Failed to set RTC to local/UTC: %s", strerror(-r));
+ return sd_bus_error_set_errnof(error, r, "Failed to set RTC to local/UTC: %s", strerror(-r));
+ }
- if (tz.local_rtc) {
- struct timespec ts;
- struct tm *tm;
+ /* 2. Tell the kernel our timezone */
+ hwclock_set_timezone(NULL);
- /* 2. Teach kernel new timezone */
- hwclock_apply_localtime_delta(NULL);
+ /* 3. Synchronize clocks */
+ assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0);
- /* 3. Sync RTC from system clock, with the new delta */
- assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0);
- assert_se(tm = localtime(&ts.tv_sec));
- hwclock_set_time(tm);
- }
+ if (fix_system) {
+ struct tm tm;
- log_info("Changed timezone to '%s'.", tz.zone);
+ /* Sync system clock from RTC; first,
+ * initialize the timezone fields of
+ * struct tm. */
+ if (c->local_rtc)
+ tm = *localtime(&ts.tv_sec);
+ else
+ tm = *gmtime(&ts.tv_sec);
- changed = bus_properties_changed_new(
- "/org/freedesktop/timedate1",
- "org.freedesktop.timedate1",
- "Timezone\0");
- if (!changed)
- goto oom;
+ /* Override the main fields of
+ * struct tm, but not the timezone
+ * fields */
+ if (hwclock_get_time(&tm) >= 0) {
+
+ /* And set the system clock
+ * with this */
+ if (c->local_rtc)
+ ts.tv_sec = mktime(&tm);
+ else
+ ts.tv_sec = timegm(&tm);
+
+ clock_settime(CLOCK_REALTIME, &ts);
}
- } else if (dbus_message_is_method_call(message, "org.freedesktop.timedate1", "SetLocalRTC")) {
- dbus_bool_t lrtc;
- dbus_bool_t fix_system;
- dbus_bool_t interactive;
-
- if (!dbus_message_get_args(
- message,
- &error,
- DBUS_TYPE_BOOLEAN, &lrtc,
- DBUS_TYPE_BOOLEAN, &fix_system,
- DBUS_TYPE_BOOLEAN, &interactive,
- DBUS_TYPE_INVALID))
- return bus_send_error_reply(connection, message, &error, -EINVAL);
-
- if (lrtc != tz.local_rtc) {
- struct timespec ts;
-
- r = verify_polkit(connection, message, "org.freedesktop.timedate1.set-local-rtc", interactive, NULL, &error);
- if (r < 0)
- return bus_send_error_reply(connection, message, &error, r);
-
- tz.local_rtc = lrtc;
-
- /* 1. Write new configuration file */
- r = write_data_local_rtc();
- if (r < 0) {
- log_error("Failed to set RTC to local/UTC: %s", strerror(-r));
- return bus_send_error_reply(connection, message, NULL, r);
- }
+ } else {
+ struct tm *tm;
- /* 2. Teach kernel new timezone */
- if (tz.local_rtc)
- hwclock_apply_localtime_delta(NULL);
- else
- hwclock_reset_localtime_delta();
-
- /* 3. Synchronize clocks */
- assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0);
-
- if (fix_system) {
- struct tm tm;
-
- /* Sync system clock from RTC; first,
- * initialize the timezone fields of
- * struct tm. */
- if (tz.local_rtc)
- tm = *localtime(&ts.tv_sec);
- else
- tm = *gmtime(&ts.tv_sec);
-
- /* Override the main fields of
- * struct tm, but not the timezone
- * fields */
- if (hwclock_get_time(&tm) >= 0) {
-
- /* And set the system clock
- * with this */
- if (tz.local_rtc)
- ts.tv_sec = mktime(&tm);
- else
- ts.tv_sec = timegm(&tm);
-
- clock_settime(CLOCK_REALTIME, &ts);
- }
-
- } else {
- struct tm *tm;
-
- /* Sync RTC from system clock */
- if (tz.local_rtc)
- tm = localtime(&ts.tv_sec);
- else
- tm = gmtime(&ts.tv_sec);
-
- hwclock_set_time(tm);
- }
+ /* Sync RTC from system clock */
+ if (c->local_rtc)
+ tm = localtime(&ts.tv_sec);
+ else
+ tm = gmtime(&ts.tv_sec);
- log_info("RTC configured to %s time.", tz.local_rtc ? "local" : "UTC");
+ hwclock_set_time(tm);
+ }
- changed = bus_properties_changed_new(
- "/org/freedesktop/timedate1",
- "org.freedesktop.timedate1",
- "LocalRTC\0");
- if (!changed)
- goto oom;
- }
+ log_info("RTC configured to %s time.", c->local_rtc ? "local" : "UTC");
- } else if (dbus_message_is_method_call(message, "org.freedesktop.timedate1", "SetTime")) {
- int64_t utc;
- dbus_bool_t relative;
- dbus_bool_t interactive;
-
- if (!dbus_message_get_args(
- message,
- &error,
- DBUS_TYPE_INT64, &utc,
- DBUS_TYPE_BOOLEAN, &relative,
- DBUS_TYPE_BOOLEAN, &interactive,
- DBUS_TYPE_INVALID))
- return bus_send_error_reply(connection, message, &error, -EINVAL);
-
- if (!relative && utc <= 0)
- return bus_send_error_reply(connection, message, NULL, -EINVAL);
-
- if (!relative || utc != 0) {
- struct timespec ts;
- struct tm* tm;
-
- r = verify_polkit(connection, message, "org.freedesktop.timedate1.set-time", interactive, NULL, &error);
- if (r < 0)
- return bus_send_error_reply(connection, message, &error, r);
-
- if (relative)
- timespec_store(&ts, now(CLOCK_REALTIME) + utc);
- else
- timespec_store(&ts, utc);
+ sd_bus_emit_properties_changed(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", "LocalRTC", NULL);
- /* Set system clock */
- if (clock_settime(CLOCK_REALTIME, &ts) < 0) {
- log_error("Failed to set local time: %m");
- return bus_send_error_reply(connection, message, NULL, -errno);
- }
+ return sd_bus_reply_method_return(m, NULL);
+}
- /* Sync down to RTC */
- if (tz.local_rtc)
- tm = localtime(&ts.tv_sec);
- else
- tm = gmtime(&ts.tv_sec);
+static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) {
+ int relative, interactive;
+ Context *c = userdata;
+ int64_t utc;
+ struct timespec ts;
+ struct tm* tm;
+ int r;
- hwclock_set_time(tm);
+ assert(bus);
+ assert(m);
+ assert(c);
- log_info("Changed local time to %s", ctime(&ts.tv_sec));
- }
- } else if (dbus_message_is_method_call(message, "org.freedesktop.timedate1", "SetNTP")) {
- dbus_bool_t ntp;
- dbus_bool_t interactive;
-
- if (!dbus_message_get_args(
- message,
- &error,
- DBUS_TYPE_BOOLEAN, &ntp,
- DBUS_TYPE_BOOLEAN, &interactive,
- DBUS_TYPE_INVALID))
- return bus_send_error_reply(connection, message, &error, -EINVAL);
-
- if (ntp != !!tz.use_ntp) {
-
- r = verify_polkit(connection, message, "org.freedesktop.timedate1.set-ntp", interactive, NULL, &error);
- if (r < 0)
- return bus_send_error_reply(connection, message, &error, r);
-
- tz.use_ntp = !!ntp;
-
- r = enable_ntp(connection, &error);
- if (r < 0)
- return bus_send_error_reply(connection, message, &error, r);
-
- r = start_ntp(connection, &error);
- if (r < 0)
- return bus_send_error_reply(connection, message, &error, r);
-
- log_info("Set NTP to %s", tz.use_ntp ? "enabled" : "disabled");
-
- changed = bus_properties_changed_new(
- "/org/freedesktop/timedate1",
- "org.freedesktop.timedate1",
- "NTP\0");
- if (!changed)
- goto oom;
- }
+ r = sd_bus_message_read(m, "xbb", &utc, &relative, &interactive);
+ if (r < 0)
+ return r;
- } else
- return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
+ if (!relative && utc <= 0)
+ return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid absolute time");
- if (!(reply = dbus_message_new_method_return(message)))
- goto oom;
+ if (relative && utc == 0)
+ return sd_bus_reply_method_return(m, NULL);
- if (!dbus_connection_send(connection, reply, NULL))
- goto oom;
+ if (relative) {
+ usec_t n, x;
- dbus_message_unref(reply);
- reply = NULL;
+ n = now(CLOCK_REALTIME);
+ x = n + utc;
- if (changed) {
+ if ((utc > 0 && x < n) ||
+ (utc < 0 && x > n))
+ return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Time value overflow");
- if (!dbus_connection_send(connection, changed, NULL))
- goto oom;
+ timespec_store(&ts, x);
+ } else
+ timespec_store(&ts, (usec_t) utc);
+
+ r = bus_verify_polkit_async(bus, &c->polkit_registry, m, "org.freedesktop.timedate1.set-time", interactive, error, method_set_time, c);
+ if (r < 0)
+ return r;
+ if (r == 0)
+ return 1;
- dbus_message_unref(changed);
+ /* Set system clock */
+ if (clock_settime(CLOCK_REALTIME, &ts) < 0) {
+ log_error("Failed to set local time: %m");
+ return sd_bus_error_set_errnof(error, errno, "Failed to set local time: %m");
}
- return DBUS_HANDLER_RESULT_HANDLED;
+ /* Sync down to RTC */
+ if (c->local_rtc)
+ tm = localtime(&ts.tv_sec);
+ else
+ tm = gmtime(&ts.tv_sec);
-oom:
- if (reply)
- dbus_message_unref(reply);
+ hwclock_set_time(tm);
- if (changed)
- dbus_message_unref(changed);
+ log_struct(LOG_INFO,
+ MESSAGE_ID(SD_MESSAGE_TIME_CHANGE),
+ "REALTIME=%llu", (unsigned long long) timespec_load(&ts),
+ "MESSAGE=Changed local time to %s", ctime(&ts.tv_sec),
+ NULL);
- dbus_error_free(&error);
+ return sd_bus_reply_method_return(m, NULL);
+}
- return DBUS_HANDLER_RESULT_NEED_MEMORY;
+static int method_set_ntp(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) {
+ int ntp, interactive;
+ Context *c = userdata;
+ int r;
+
+ r = sd_bus_message_read(m, "bb", &ntp, &interactive);
+ if (r < 0)
+ return r;
+
+ if ((bool)ntp == c->use_ntp)
+ return sd_bus_reply_method_return(m, NULL);
+
+ r = bus_verify_polkit_async(bus, &c->polkit_registry, m, "org.freedesktop.timedate1.set-ntp", interactive, error, method_set_ntp, c);
+ if (r < 0)
+ return r;
+ if (r == 0)
+ return 1;
+
+ c->use_ntp = ntp;
+
+ r = context_enable_ntp(c, bus, error);
+ if (r < 0)
+ return r;
+
+ r = context_start_ntp(c, bus, error);
+ if (r < 0)
+ return r;
+
+ log_info("Set NTP to %s", c->use_ntp ? "enabled" : "disabled");
+
+ sd_bus_emit_properties_changed(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", "NTP", NULL);
+
+ return sd_bus_reply_method_return(m, NULL);
}
-static int connect_bus(DBusConnection **_bus) {
- static const DBusObjectPathVTable timedate_vtable = {
- .message_function = timedate_message_handler
- };
- DBusError error;
- DBusConnection *bus = NULL;
+static const sd_bus_vtable timedate_vtable[] = {
+ SD_BUS_VTABLE_START(0),
+ SD_BUS_PROPERTY("Timezone", "s", NULL, offsetof(Context, zone), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("LocalRTC", "b", NULL, offsetof(Context, local_rtc), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("CanNTP", "b", bus_property_get_tristate, offsetof(Context, can_ntp), 0),
+ SD_BUS_PROPERTY("NTP", "b", bus_property_get_tristate, offsetof(Context, use_ntp), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_PROPERTY("NTPSynchronized", "b", property_get_ntp_sync, 0, 0),
+ SD_BUS_PROPERTY("TimeUSec", "t", property_get_time, 0, 0),
+ SD_BUS_PROPERTY("RTCTimeUSec", "t", property_get_rtc_time, 0, 0),
+ SD_BUS_METHOD("SetTime", "xbb", NULL, method_set_time, 0),
+ SD_BUS_METHOD("SetTimezone", "sb", NULL, method_set_timezone, 0),
+ SD_BUS_METHOD("SetLocalRTC", "bbb", NULL, method_set_local_rtc, 0),
+ SD_BUS_METHOD("SetNTP", "bb", NULL, method_set_ntp, 0),
+ SD_BUS_VTABLE_END,
+};
+
+static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
+ _cleanup_bus_unref_ sd_bus *bus = NULL;
int r;
+ assert(c);
+ assert(event);
assert(_bus);
- dbus_error_init(&error);
-
- bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
- if (!bus) {
- log_error("Failed to get system D-Bus connection: %s", bus_error_message(&error));
- r = -ECONNREFUSED;
- goto fail;
+ r = sd_bus_default_system(&bus);
+ if (r < 0) {
+ log_error("Failed to get system bus connection: %s", strerror(-r));
+ return r;
}
- dbus_connection_set_exit_on_disconnect(bus, FALSE);
-
- if (!dbus_connection_register_object_path(bus, "/org/freedesktop/timedate1", &timedate_vtable, NULL) ||
- !dbus_connection_add_filter(bus, bus_exit_idle_filter, &remain_until, NULL)) {
- log_error("Out of memory.");
- r = -ENOMEM;
- goto fail;
+ r = sd_bus_add_object_vtable(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", timedate_vtable, c);
+ if (r < 0) {
+ log_error("Failed to register object: %s", strerror(-r));
+ return r;
}
- r = dbus_bus_request_name(bus, "org.freedesktop.timedate1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error);
- if (dbus_error_is_set(&error)) {
- log_error("Failed to register name on bus: %s", bus_error_message(&error));
- r = -EEXIST;
- goto fail;
+ r = sd_bus_request_name(bus, "org.freedesktop.timedate1", SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_DO_NOT_QUEUE);
+ if (r < 0) {
+ log_error("Failed to register name: %s", strerror(-r));
+ return r;
}
- if (r != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
- log_error("Failed to acquire name.");
- r = -EEXIST;
- goto fail;
+ r = sd_bus_attach_event(bus, event, 0);
+ if (r < 0) {
+ log_error("Failed to attach bus to event loop: %s", strerror(-r));
+ return r;
}
- if (_bus)
- *_bus = bus;
+ *_bus = bus;
+ bus = NULL;
return 0;
-
-fail:
- dbus_connection_close(bus);
- dbus_connection_unref(bus);
-
- dbus_error_free(&error);
-
- return r;
}
int main(int argc, char *argv[]) {
+ Context context = {
+ .zone = NULL,
+ .local_rtc = false,
+ .can_ntp = -1,
+ .use_ntp = -1,
+ };
+
+ _cleanup_event_unref_ sd_event *event = NULL;
+ _cleanup_bus_unref_ sd_bus *bus = NULL;
int r;
- DBusConnection *bus = NULL;
- bool exiting = false;
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
@@ -986,58 +822,44 @@ int main(int argc, char *argv[]) {
umask(0022);
- if (argc == 2 && streq(argv[1], "--introspect")) {
- fputs(DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
- "\n", stdout);
- fputs(timedate_interface, stdout);
- fputs("\n", stdout);
- return 0;
- }
-
if (argc != 1) {
log_error("This program takes no arguments.");
r = -EINVAL;
goto finish;
}
- r = read_data();
+ r = sd_event_default(&event);
if (r < 0) {
- log_error("Failed to read timezone data: %s", strerror(-r));
+ log_error("Failed to allocate event loop: %s", strerror(-r));
goto finish;
}
- r = connect_bus(&bus);
+ r = connect_bus(&context, event, &bus);
if (r < 0)
goto finish;
- r = read_ntp(bus);
+ r = context_read_data(&context);
if (r < 0) {
- log_error("Failed to determine whether NTP is enabled: %s", strerror(-r));
+ log_error("Failed to read timezone data: %s", strerror(-r));
goto finish;
}
- remain_until = now(CLOCK_MONOTONIC) + DEFAULT_EXIT_USEC;
- for (;;) {
-
- if (!dbus_connection_read_write_dispatch(bus, exiting ? -1 : (int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC)))
- break;
+ r = context_read_ntp(&context, bus);
+ if (r < 0) {
+ log_error("Failed to determine whether NTP is enabled: %s", strerror(-r));
+ goto finish;
+ }
- if (!exiting && remain_until < now(CLOCK_MONOTONIC)) {
- exiting = true;
- bus_async_unregister_and_exit(bus, "org.freedesktop.hostname1");
- }
+ r = bus_event_loop_with_idle(event, bus, "org.freedesktop.timedate1", DEFAULT_EXIT_USEC);
+ if (r < 0) {
+ log_error("Failed to run event loop: %s", strerror(-r));
+ goto finish;
}
r = 0;
finish:
- free_data();
-
- if (bus) {
- dbus_connection_flush(bus);
- dbus_connection_close(bus);
- dbus_connection_unref(bus);
- }
+ context_free(&context, bus);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}