#include <sys/timex.h>
#include <sys/socket.h>
#include <resolv.h>
+#include <sys/prctl.h>
+#include <sys/types.h>
+#include <grp.h>
#include "missing.h"
#include "util.h"
#include "sd-event.h"
#include "sd-resolve.h"
#include "sd-daemon.h"
+#include "sd-network.h"
+#include "event-util.h"
+#include "network-util.h"
+#include "clock-util.h"
+#include "capability.h"
+#include "mkdir.h"
#include "timesyncd.h"
#define TIME_T_MAX (time_t)((1UL << ((sizeof(time_t) << 3) - 1)) - 1)
return d * d;
}
+static int load_clock_timestamp(uid_t uid, gid_t gid) {
+ _cleanup_close_ int fd = -1;
+ usec_t min = TIME_EPOCH * USEC_PER_SEC;
+ usec_t ct;
+ int r;
+
+ /* Let's try to make sure that the clock is always
+ * monotonically increasing, by saving the clock whenever we
+ * have a new NTP time, or when we shut down, and restoring it
+ * when we start again. This is particularly helpful on
+ * systems lacking a battery backed RTC. We also will adjust
+ * the time to at least the build time of systemd. */
+
+ fd = open("/var/lib/systemd/clock", O_RDWR|O_CLOEXEC, 0644);
+ if (fd >= 0) {
+ struct stat st;
+ usec_t stamp;
+
+ /* check if the recorded time is later than the compiled-in one */
+ r = fstat(fd, &st);
+ if (r >= 0) {
+ stamp = timespec_load(&st.st_mtim);
+ if (stamp > min)
+ min = stamp;
+ }
+
+ /* Try to fix the access mode, so that we can still
+ touch the file after dropping priviliges */
+ fchmod(fd, 0644);
+ fchown(fd, uid, gid);
+
+ } else
+ /* create stamp file with the compiled-in date */
+ touch_file("/var/lib/systemd/clock", true, min, uid, gid, 0644);
+
+ ct = now(CLOCK_REALTIME);
+ if (ct < min) {
+ struct timespec ts;
+ char date[FORMAT_TIMESTAMP_MAX];
+
+ log_info("System clock time unset or jumped backwards, restoring from recorded timestamp: %s",
+ format_timestamp(date, sizeof(date), min));
+
+ if (clock_settime(CLOCK_REALTIME, timespec_store(&ts, min)) < 0)
+ log_error("Failed to restore system clock: %m");
+ }
+
+ return 0;
+}
+
static int manager_timeout(sd_event_source *source, usec_t usec, void *userdata) {
_cleanup_free_ char *pretty = NULL;
Manager *m = userdata;
assert(m->current_server_name);
assert(m->current_server_address);
- sockaddr_pretty(&m->current_server_address->sockaddr.sa, m->current_server_address->socklen, true, &pretty);
+ server_address_pretty(m->current_server_address, &pretty);
log_info("Timed out waiting for reply from %s (%s).", strna(pretty), m->current_server_name->string);
return manager_connect(m);
ntpmsg.trans_time.sec = htobe32(m->trans_time.tv_sec + OFFSET_1900_1970);
ntpmsg.trans_time.frac = htobe32(m->trans_time.tv_nsec);
- sockaddr_pretty(&m->current_server_address->sockaddr.sa, m->current_server_address->socklen, true, &pretty);
+ server_address_pretty(m->current_server_address, &pretty);
len = sendto(m->server_socket, &ntpmsg, sizeof(ntpmsg), MSG_DONTWAIT, &m->current_server_address->sockaddr.sa, m->current_server_address->socklen);
if (len == sizeof(ntpmsg)) {
return manager_connect(m);
}
- /* re-arm timer with incresing timeout, in case the packets never arrive back */
+ /* re-arm timer with increasing timeout, in case the packets never arrive back */
if (m->retry_interval > 0) {
if (m->retry_interval < NTP_POLL_INTERVAL_MAX_SEC * USEC_PER_SEC)
m->retry_interval *= 2;
if (r < 0)
return r;
+ touch("/var/lib/systemd/clock");
+
m->drift_ppm = tmx.freq / 65536;
log_debug(" status : %04i %s\n"
- " time now : %li.%03lli\n"
+ " time now : %li.%03llu\n"
" constant : %li\n"
" offset : %+.3f sec\n"
" freq offset : %+li (%i ppm)\n",
tmx.status, tmx.status & STA_UNSYNC ? "" : "sync",
- tmx.time.tv_sec, tmx.time.tv_usec / NSEC_PER_MSEC,
+ tmx.time.tv_sec, (unsigned long long) (tmx.time.tv_usec / NSEC_PER_MSEC),
tmx.constant,
(double)tmx.offset / NSEC_PER_SEC,
tmx.freq, m->drift_ppm);
" delay : %+.3f sec\n"
" packet count : %"PRIu64"\n"
" jitter : %.3f%s\n"
- " poll interval: %llu\n",
+ " poll interval: " USEC_FMT "\n",
NTP_FIELD_LEAP(ntpmsg.field),
NTP_FIELD_VERSION(ntpmsg.field),
NTP_FIELD_MODE(ntpmsg.field),
m->poll_interval_usec / USEC_PER_SEC);
if (!spike) {
+ m->sync = true;
r = manager_adjust_clock(m, offset, leap_sec);
if (r < 0)
log_error("Failed to call clock_adjtime(): %m");
}
- log_info("interval/delta/delay/jitter/drift %llus/%+.3fs/%.3fs/%.3fs/%+ippm%s",
+ log_info("interval/delta/delay/jitter/drift " USEC_FMT "s/%+.3fs/%.3fs/%.3fs/%+ippm%s",
m->poll_interval_usec / USEC_PER_SEC, offset, delay, m->samples_jitter, m->drift_ppm,
spike ? " (ignored)" : "");
m->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
- sockaddr_pretty(&m->current_server_address->sockaddr.sa, m->current_server_address->socklen, true, &pretty);
+ server_address_pretty(m->current_server_address, &pretty);
log_info("Using NTP server %s (%s).", strna(pretty), m->current_server_name->string);
sd_notifyf(false, "STATUS=Using Time Server %s (%s).", strna(pretty), m->current_server_name->string);
m->resolve_query = sd_resolve_query_unref(m->resolve_query);
if (ret != 0) {
- log_info("Failed to resolve %s: %s", m->current_server_name->string, gai_strerror(ret));
+ log_debug("Failed to resolve %s: %s", m->current_server_name->string, gai_strerror(ret));
/* Try next host */
return manager_connect(m);
_cleanup_manager_free_ Manager *m = NULL;
int r;
+ assert(ret);
+
m = new0(Manager, 1);
if (!m)
return -ENOMEM;
if (r < 0)
return r;
- sd_event_add_signal(m->event, &m->sigterm, SIGTERM, NULL, NULL);
- sd_event_add_signal(m->event, &m->sigint, SIGINT, NULL, NULL);
+ sd_event_set_watchdog(m->event, true);
+
+ sd_event_add_signal(m->event, NULL, SIGTERM, NULL, NULL);
+ sd_event_add_signal(m->event, NULL, SIGINT, NULL, NULL);
r = sd_resolve_default(&m->resolve);
if (r < 0)
return r;
r = sd_resolve_attach_event(m->resolve, m->event, 0);
- if (r < 0)
- return 0;
-
- r = manager_clock_watch_setup(m);
if (r < 0)
return r;
manager_disconnect(m);
manager_flush_names(m);
- sd_event_source_unref(m->sigint);
- sd_event_source_unref(m->sigterm);
-
sd_event_source_unref(m->event_retry);
+ sd_event_source_unref(m->network_event_source);
+ sd_network_monitor_unref(m->network_monitor);
+
sd_resolve_unref(m->resolve);
sd_event_unref(m->event);
}
static int manager_parse_config_file(Manager *m) {
- static const char fn[] = "/etc/systemd/timesyncd.conf";
- _cleanup_fclose_ FILE *f = NULL;
+ return config_parse(NULL, "/etc/systemd/timesyncd.conf", NULL,
+ "Time\0",
+ config_item_perf_lookup, timesyncd_gperf_lookup,
+ false, false, true, m);
+}
+
+static bool network_is_online(void) {
+ _cleanup_free_ char *state = NULL;
int r;
- assert(m);
+ r = sd_network_get_operational_state(&state);
+ if (r >= 0 && STR_IN_SET(state, "routable", "degraded"))
+ return true;
- f = fopen(fn, "re");
- if (!f) {
- if (errno == ENOENT)
- return 0;
+ return false;
+}
- log_warning("Failed to open configuration file %s: %m", fn);
- return -errno;
+static int manager_network_event_handler(sd_event_source *s, int fd, uint32_t revents,
+ void *userdata) {
+ Manager *m = userdata;
+ bool connected, online;
+ int r;
+
+ assert(m);
+
+ /* check if the machine is online */
+ online = network_is_online();
+
+ /* check if the client is currently connected */
+ connected = (m->server_socket != -1);
+
+ if (connected && !online) {
+ log_info("No network connectivity, watching for changes.");
+ manager_disconnect(m);
+ } else if (!connected && online) {
+ log_info("Network configuration changed, trying to establish connection.");
+ if (m->current_server_address) {
+ r = manager_begin(m);
+ if (r < 0)
+ return r;
+ } else {
+ r = manager_connect(m);
+ if (r < 0)
+ return r;
+ }
}
- r = config_parse(NULL, fn, f, "Time\0", config_item_perf_lookup,
- (void*) timesyncd_gperf_lookup, false, false, m);
+ sd_network_monitor_flush(m->network_monitor);
+
+ return 0;
+}
+
+static int manager_network_monitor_listen(Manager *m) {
+ _cleanup_event_source_unref_ sd_event_source *event_source = NULL;
+ _cleanup_network_monitor_unref_ sd_network_monitor *monitor = NULL;
+ int r, fd, events;
+
+ r = sd_network_monitor_new(&monitor, NULL);
if (r < 0)
- log_warning("Failed to parse configuration file: %s", strerror(-r));
+ return r;
+
+ fd = sd_network_monitor_get_fd(monitor);
+ if (fd < 0)
+ return fd;
- return r;
+ events = sd_network_monitor_get_events(monitor);
+ if (events < 0)
+ return events;
+
+ r = sd_event_add_io(m->event, &event_source, fd, events,
+ &manager_network_event_handler, m);
+ if (r < 0)
+ return r;
+
+ m->network_monitor = monitor;
+ m->network_event_source = event_source;
+ monitor = NULL;
+ event_source = NULL;
+
+ return 0;
}
int main(int argc, char *argv[]) {
+ const char *user = "systemd-timesync";
_cleanup_manager_free_ Manager *m = NULL;
+ uid_t uid;
+ gid_t gid;
int r;
if (argc > 1) {
umask(0022);
+ r = get_user_creds(&user, &uid, &gid, NULL, NULL);
+ if (r < 0) {
+ log_error("Cannot resolve user name %s: %s", user, strerror(-r));
+ return r;
+ }
+
+ r = load_clock_timestamp(uid, gid);
+ if (r < 0)
+ goto out;
+
+ r = drop_privileges(uid, gid, (1ULL << CAP_SYS_TIME));
+ if (r < 0)
+ goto out;
+
assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
r = manager_new(&m);
manager_add_server_string(m, NTP_SERVERS);
manager_parse_config_file(m);
+ r = manager_network_monitor_listen(m);
+ if (r < 0) {
+ log_error("Failed to listen to networkd events: %s", strerror(-r));
+ goto out;
+ }
+
log_debug("systemd-timesyncd running as pid %lu", (unsigned long) getpid());
sd_notify(false, "READY=1");
- r = manager_connect(m);
- if (r < 0)
- goto out;
+ if (network_is_online()) {
+ r = manager_connect(m);
+ if (r < 0)
+ goto out;
+ }
r = sd_event_loop(m->event);
if (r < 0) {
sd_event_get_exit_code(m->event, &r);
+ /* if we got an authoritative time, store it in the file system */
+ if (m->sync)
+ touch("/var/lib/systemd/clock");
+
out:
sd_notify(false, "STATUS=Shutting down...");
~ianmdlvl / elogind.git / blobdiff