X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftimedate%2Ftimedated.c;h=95255def298a2e22d54b886561997a30133809ce;hp=9858f5694c79a329c9a921daceebd7d88f710744;hb=24efb112451413c1013d5f7fe27d7e2cd407647a;hpb=36f9f99556b2fd90705a9eda2e8f182b1e63a15e diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 9858f5694..95255def2 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -31,7 +31,7 @@ #include "util.h" #include "strv.h" #include "def.h" -#include "hwclock.h" +#include "clock-util.h" #include "conf-files.h" #include "path-util.h" #include "fileio-label.h" @@ -126,7 +126,7 @@ static int context_read_data(Context *c) { r = readlink_malloc("/etc/localtime", &t); if (r < 0) { if (r == -EINVAL) - log_warning("/etc/localtime should be a symbolic link to a timezone data file in /usr/share/zoneinfo/."); + log_warning("/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/."); else log_warning("Failed to get target of /etc/localtime: %s", strerror(-r)); } else { @@ -137,7 +137,7 @@ static int context_read_data(Context *c) { e = path_startswith(t, "../usr/share/zoneinfo/"); if (!e) - log_warning("/etc/localtime should be a symbolic link to a timezone data file in /usr/share/zoneinfo/."); + log_warning("/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/."); else { c->zone = strdup(e); if (!c->zone) @@ -153,7 +153,7 @@ have_timezone: c->zone = NULL; } - c->local_rtc = hwclock_is_localtime() > 0; + c->local_rtc = clock_is_localtime() > 0; return 0; } @@ -248,9 +248,6 @@ static char** get_ntp_services(void) { "/run/systemd/ntp-units.d", "/usr/local/lib/systemd/ntp-units.d", "/usr/lib/systemd/ntp-units.d", -#ifdef HAVE_SPLIT_USR - "/lib/systemd/ntp-units.d", -#endif NULL); if (k < 0) return NULL; @@ -266,9 +263,8 @@ static char** get_ntp_services(void) { char line[PATH_MAX], *l; if (!fgets(line, sizeof(line), f)) { - if (ferror(f)) - log_error("Failed to read NTP units file: %m"); + log_error("Failed to read NTP unit file: %m"); break; } @@ -316,7 +312,7 @@ static int context_read_ntp(Context *c, sd_bus *bus) { *i); if (r < 0) { - /* This implementation does not exist, try next one */ + /* This implementation does not exist. Try the next one. */ if (sd_bus_error_has_name(&error, SD_BUS_ERROR_FILE_NOT_FOUND)) continue; @@ -379,7 +375,7 @@ static int context_start_ntp(Context *c, sd_bus *bus, sd_bus_error *error) { 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 */ + /* This implementation does not exist. Try the next one. */ sd_bus_error_free(error); continue; } @@ -428,7 +424,7 @@ static int context_enable_ntp(Context*c, sd_bus *bus, sd_bus_error *error) { if (r < 0) { if (sd_bus_error_has_name(error, SD_BUS_ERROR_FILE_NOT_FOUND)) { - /* This implementation does not exist, try next one */ + /* This implementation does not exist. Try the next one. */ sd_bus_error_free(error); continue; } @@ -461,29 +457,27 @@ static int property_get_rtc_time( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { struct tm tm; usec_t t; int r; zero(tm); - r = hwclock_get_time(&tm); + r = clock_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."); + log_warning("/dev/rtc is busy. Is somebody keeping it open continuously? That's not a good idea... Returning a bogus RTC timestamp."); t = 0; - } else if (r < 0) { - sd_bus_error_set_errnof(error, -r, "Failed to read RTC: %s", strerror(-r)); - return r; - } else - t = (usec_t) mktime(&tm) * USEC_PER_SEC; - - r = sd_bus_message_append(reply, "t", t); - if (r < 0) - return r; + } else if (r == -ENOENT) { + log_debug("/dev/rtc not found."); + t = 0; /* no RTC found */ + } 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 1; + return sd_bus_message_append(reply, "t", t); } static int property_get_time( @@ -492,16 +486,10 @@ static int property_get_time( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { - - int r; + void *userdata, + sd_bus_error *error) { - r = sd_bus_message_append(reply, "t", now(CLOCK_REALTIME)); - if (r < 0) - return r; - - return 1; + return sd_bus_message_append(reply, "t", now(CLOCK_REALTIME)); } static int property_get_ntp_sync( @@ -510,23 +498,16 @@ static int property_get_ntp_sync( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { - - int r; - - r = sd_bus_message_append(reply, "b", ntp_synced()); - if (r < 0) - return r; + void *userdata, + sd_bus_error *error) { - return 1; + return sd_bus_message_append(reply, "b", ntp_synced()); } -static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; +static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) { Context *c = userdata; const char *z; - unsigned interactive; + int interactive; char *t; int r; @@ -536,23 +517,23 @@ static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata) { r = sd_bus_message_read(m, "sb", &z, &interactive); if (r < 0) - return sd_bus_reply_method_errno(bus, m, r, NULL); + return r; if (!valid_timezone(z)) - return sd_bus_reply_method_errorf(bus, m, SD_BUS_ERROR_INVALID_ARGS, "Invalid time zone '%s'", 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(bus, m, NULL); + 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); + 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 sd_bus_reply_method_errno(bus, m, r, &error); + 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 log_oom(); + return -ENOMEM; free(c->zone); c->zone = t; @@ -560,12 +541,12 @@ static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata) { /* 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_reply_method_errnof(bus, m, r, "Failed to set timezone: %s", strerror(-r)); + log_error("Failed to set time zone: %s", strerror(-r)); + return sd_bus_error_set_errnof(error, r, "Failed to set time zone: %s", strerror(-r)); } /* 2. Tell the kernel our timezone */ - hwclock_set_timezone(NULL); + clock_set_timezone(NULL); if (c->local_rtc) { struct timespec ts; @@ -574,23 +555,22 @@ static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata) { /* 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); + clock_set_time(tm); } log_struct(LOG_INFO, MESSAGE_ID(SD_MESSAGE_TIMEZONE_CHANGE), "TIMEZONE=%s", c->zone, - "MESSAGE=Changed timezone to '%s'.", c->zone, + "MESSAGE=Changed time zone to '%s'.", c->zone, NULL); sd_bus_emit_properties_changed(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", "Timezone", NULL); - return sd_bus_reply_method_return(bus, m, NULL); + return sd_bus_reply_method_return(m, NULL); } -static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - unsigned lrtc, fix_system, interactive; +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; @@ -601,14 +581,14 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata) r = sd_bus_message_read(m, "bbb", &lrtc, &fix_system, &interactive); if (r < 0) - return sd_bus_reply_method_errno(bus, m, r, NULL); + return r; if (lrtc == c->local_rtc) - return sd_bus_reply_method_return(bus, m, NULL); + return sd_bus_reply_method_return(m, NULL); - r = bus_verify_polkit_async(bus, &c->polkit_registry, m, "org.freedesktop.timedate1.set-local-rtc", interactive, &error, method_set_local_rtc, c); + 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 sd_bus_reply_method_errno(bus, m, r, &error); + return r; if (r == 0) return 1; @@ -618,11 +598,11 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata) 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_reply_method_errnof(bus, m, r, "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)); } /* 2. Tell the kernel our timezone */ - hwclock_set_timezone(NULL); + clock_set_timezone(NULL); /* 3. Synchronize clocks */ assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0); @@ -641,7 +621,7 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata) /* Override the main fields of * struct tm, but not the timezone * fields */ - if (hwclock_get_time(&tm) >= 0) { + if (clock_get_time(&tm) >= 0) { /* And set the system clock * with this */ @@ -662,19 +642,18 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata) else tm = gmtime(&ts.tv_sec); - hwclock_set_time(tm); + clock_set_time(tm); } log_info("RTC configured to %s time.", c->local_rtc ? "local" : "UTC"); sd_bus_emit_properties_changed(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", "LocalRTC", NULL); - return sd_bus_reply_method_return(bus, m, NULL); + return sd_bus_reply_method_return(m, NULL); } -static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - unsigned relative, interactive; +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; @@ -687,13 +666,13 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata) { r = sd_bus_message_read(m, "xbb", &utc, &relative, &interactive); if (r < 0) - return sd_bus_reply_method_errno(bus, m, r, NULL); + return r; if (!relative && utc <= 0) - return sd_bus_reply_method_errorf(bus, m, SD_BUS_ERROR_INVALID_ARGS, "Invalid absolute time"); + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid absolute time"); if (relative && utc == 0) - return sd_bus_reply_method_return(bus, m, NULL); + return sd_bus_reply_method_return(m, NULL); if (relative) { usec_t n, x; @@ -703,22 +682,22 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata) { if ((utc > 0 && x < n) || (utc < 0 && x > n)) - return sd_bus_reply_method_errorf(bus, m, SD_BUS_ERROR_INVALID_ARGS, "Time value overflow"); + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Time value overflow"); 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); + 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 sd_bus_reply_method_errno(bus, m, r, &error); + return r; if (r == 0) return 1; /* Set system clock */ if (clock_settime(CLOCK_REALTIME, &ts) < 0) { log_error("Failed to set local time: %m"); - return sd_bus_reply_method_errnof(bus, m, errno, "Failed to set local time: %m"); + return sd_bus_error_set_errnof(error, errno, "Failed to set local time: %m"); } /* Sync down to RTC */ @@ -727,53 +706,54 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata) { else tm = gmtime(&ts.tv_sec); - hwclock_set_time(tm); + clock_set_time(tm); log_struct(LOG_INFO, MESSAGE_ID(SD_MESSAGE_TIME_CHANGE), - "REALTIME=%llu", (unsigned long long) timespec_load(&ts), + "REALTIME="USEC_FMT, timespec_load(&ts), "MESSAGE=Changed local time to %s", ctime(&ts.tv_sec), NULL); - return sd_bus_reply_method_return(bus, m, NULL); + return sd_bus_reply_method_return(m, NULL); } -static int method_set_ntp(sd_bus *bus, sd_bus_message *m, void *userdata) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - unsigned ntp, interactive; +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 sd_bus_reply_method_errno(bus, m, r, NULL); + return r; - if (ntp == c->use_ntp) - return sd_bus_reply_method_return(bus, m, NULL); + 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); + 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 sd_bus_reply_method_errno(bus, m, r, &error); + return r; if (r == 0) return 1; c->use_ntp = ntp; - r = context_enable_ntp(c, bus, &error); + r = context_enable_ntp(c, bus, error); if (r < 0) - return sd_bus_reply_method_errno(bus, m, r, &error); + return r; - r = context_start_ntp(c, bus, &error); + r = context_start_ntp(c, bus, error); if (r < 0) - return sd_bus_reply_method_errno(bus, m, r, &error); + 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(bus, m, NULL); + return sd_bus_reply_method_return(m, NULL); } +#include + 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), @@ -783,10 +763,10 @@ static const sd_bus_vtable timedate_vtable[] = { 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_METHOD("SetTime", "xbb", NULL, method_set_time, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("SetTimezone", "sb", NULL, method_set_timezone, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("SetLocalRTC", "bbb", NULL, method_set_local_rtc, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("SetNTP", "bb", NULL, method_set_ntp, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_VTABLE_END, }; @@ -798,29 +778,24 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) { assert(event); assert(_bus); - r = sd_bus_open_system(&bus); + r = sd_bus_default_system(&bus); if (r < 0) { log_error("Failed to get system bus connection: %s", strerror(-r)); return r; } - r = sd_bus_add_object_vtable(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", timedate_vtable, c); + r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", timedate_vtable, c); if (r < 0) { log_error("Failed to register object: %s", strerror(-r)); return r; } - r = sd_bus_request_name(bus, "org.freedesktop.timedate1", SD_BUS_NAME_DO_NOT_QUEUE); + r = sd_bus_request_name(bus, "org.freedesktop.timedate1", 0); if (r < 0) { log_error("Failed to register name: %s", strerror(-r)); return r; } - if (r != SD_BUS_NAME_PRIMARY_OWNER) { - log_error("Failed to acquire name."); - return -EEXIST; - } - r = sd_bus_attach_event(bus, event, 0); if (r < 0) { log_error("Failed to attach bus to event loop: %s", strerror(-r)); @@ -857,19 +832,21 @@ int main(int argc, char *argv[]) { goto finish; } - r = sd_event_new(&event); + r = sd_event_default(&event); if (r < 0) { log_error("Failed to allocate event loop: %s", strerror(-r)); goto finish; } + sd_event_set_watchdog(event, true); + r = connect_bus(&context, event, &bus); if (r < 0) goto finish; r = context_read_data(&context); if (r < 0) { - log_error("Failed to read timezone data: %s", strerror(-r)); + log_error("Failed to read time zone data: %s", strerror(-r)); goto finish; } @@ -879,14 +856,12 @@ int main(int argc, char *argv[]) { goto finish; } - r = bus_event_loop_with_idle(event, bus, "org.freedesktop.timedate1", DEFAULT_EXIT_USEC); + r = bus_event_loop_with_idle(event, bus, "org.freedesktop.timedate1", DEFAULT_EXIT_USEC, NULL, NULL); if (r < 0) { log_error("Failed to run event loop: %s", strerror(-r)); goto finish; } - r = 0; - finish: context_free(&context, bus);