* The actual value does not matter, We do not care about the correct
* NTP UINT_MAX fraction; we just pass the plain nanosecond value.
*/
- assert_se(clock_gettime(CLOCK_MONOTONIC, &m->trans_time_mon) >= 0);
+ assert_se(clock_gettime(clock_boottime_or_monotonic(), &m->trans_time_mon) >= 0);
assert_se(clock_gettime(CLOCK_REALTIME, &m->trans_time) >= 0);
ntpmsg.trans_time.sec = htobe32(m->trans_time.tv_sec + OFFSET_1900_1970);
ntpmsg.trans_time.frac = htobe32(m->trans_time.tv_nsec);
r = sd_event_add_time(
m->event,
&m->event_timeout,
- CLOCK_MONOTONIC,
- now(CLOCK_MONOTONIC) + TIMEOUT_USEC, 0,
+ clock_boottime_or_monotonic(),
+ now(clock_boottime_or_monotonic()) + TIMEOUT_USEC, 0,
manager_timeout, m);
if (r < 0) {
log_error("Failed to arm timeout timer: %s", strerror(-r));
}
if (m->event_timer) {
- r = sd_event_source_set_time(m->event_timer, now(CLOCK_MONOTONIC) + next);
+ r = sd_event_source_set_time(m->event_timer, now(clock_boottime_or_monotonic()) + next);
if (r < 0)
return r;
return sd_event_add_time(
m->event,
&m->event_timer,
- CLOCK_MONOTONIC,
- now(CLOCK_MONOTONIC) + next, 0,
+ clock_boottime_or_monotonic(),
+ now(clock_boottime_or_monotonic()) + next, 0,
manager_timer, m);
}
/* resync */
log_info("System time changed. Resyncing.");
m->poll_resync = true;
+
return manager_send_request(m);
}
* The round-trip delay, d, and system clock offset, t, are defined as:
* d = (T4 - T1) - (T3 - T2) t = ((T2 - T1) + (T3 - T4)) / 2"
*/
- assert_se(clock_gettime(CLOCK_MONOTONIC, &now_ts) >= 0);
+ assert_se(clock_gettime(clock_boottime_or_monotonic(), &now_ts) >= 0);
origin = tv_to_d(recv_time) - (ts_to_d(&now_ts) - ts_to_d(&m->trans_time_mon)) + OFFSET_1900_1970;
receive = ntp_ts_to_d(&ntpmsg.recv_time);
trans = ntp_ts_to_d(&ntpmsg.trans_time);
if (!ratelimit_test(&m->ratelimit)) {
log_debug("Slowing down attempts to contact servers.");
- r = sd_event_add_time(m->event, &m->event_retry, CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + RETRY_USEC, 0, manager_retry, m);
+ r = sd_event_add_time(m->event, &m->event_retry, clock_boottime_or_monotonic(), now(clock_boottime_or_monotonic()) + RETRY_USEC, 0, manager_retry, m);
if (r < 0) {
log_error("Failed to create retry timer: %s", strerror(-r));
return r;
}
static int manager_parse_config_file(Manager *m) {
+ assert(m);
+
return config_parse(NULL, "/etc/systemd/timesyncd.conf", NULL,
"Time\0",
config_item_perf_lookup, timesyncd_gperf_lookup,
int r;
r = sd_network_get_operational_state(&state);
- if (r >= 0 && STR_IN_SET(state, "routable", "degraded"))
+ if (r < 0) /* if we don't know anything, we consider the system online */
+ return true;
+
+ if (STR_IN_SET(state, "routable", "degraded"))
return true;
return false;
}
-static int manager_network_event_handler(sd_event_source *s, int fd, uint32_t revents,
- void *userdata) {
+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);
+ sd_network_monitor_flush(m->network_monitor);
+
/* check if the machine is online */
online = network_is_online();
/* check if the client is currently connected */
- connected = (m->server_socket != -1);
+ connected = m->server_socket >= 0;
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) {
+
+ if (m->current_server_address)
r = manager_begin(m);
- if (r < 0)
- return r;
- } else {
+ else
r = manager_connect(m);
- if (r < 0)
- return r;
- }
+ if (r < 0)
+ return r;
}
- 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);
+ assert(m);
+
+ r = sd_network_monitor_new(&m->network_monitor, NULL);
if (r < 0)
return r;
- fd = sd_network_monitor_get_fd(monitor);
+ fd = sd_network_monitor_get_fd(m->network_monitor);
if (fd < 0)
return fd;
- events = sd_network_monitor_get_events(monitor);
+ events = sd_network_monitor_get_events(m->network_monitor);
if (events < 0)
return events;
- r = sd_event_add_io(m->event, &event_source, fd, events,
- &manager_network_event_handler, m);
+ r = sd_event_add_io(m->event, &m->network_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;
+ const char *user = "systemd-timesync";
uid_t uid;
gid_t gid;
int r;