[systemd-commits] 9 commits - Makefile-man.am Makefile.am TODO man/systemd-resolved.service.xml man/systemd-timesyncd.service.xml man/timesyncd.conf.xml src/libsystemd src/resolve src/timesync
Lennart Poettering
lennart at kemper.freedesktop.org
Tue Aug 12 10:50:56 PDT 2014
Makefile-man.am | 4
Makefile.am | 10
TODO | 4
man/systemd-resolved.service.xml | 8
man/systemd-timesyncd.service.xml | 12
man/timesyncd.conf.xml | 115 +++
src/libsystemd/sd-network/network-util.c | 37 +
src/libsystemd/sd-network/network-util.h | 3
src/libsystemd/sd-resolve/sd-resolve.c | 29
src/resolve/resolved-conf.c | 16
src/resolve/resolved-dns-server.c | 12
src/resolve/resolved-dns-server.h | 6
src/resolve/resolved-manager.c | 18
src/resolve/resolved-manager.h | 2
src/resolve/resolved.c | 2
src/timesync/timesyncd-conf.c | 104 ++
src/timesync/timesyncd-conf.h | 34
src/timesync/timesyncd-gperf.gperf | 6
src/timesync/timesyncd-manager.c | 1122 ++++++++++++++++++++++++++++++
src/timesync/timesyncd-manager.h | 103 ++
src/timesync/timesyncd-server.c | 151 ++++
src/timesync/timesyncd-server.h | 67 +
src/timesync/timesyncd.c | 1142 -------------------------------
src/timesync/timesyncd.conf.in | 3
src/timesync/timesyncd.h | 107 --
25 files changed, 1843 insertions(+), 1274 deletions(-)
New commits:
commit ed220efd6657822332b9563ec53c5ab9f3c33220
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Aug 12 19:50:36 2014 +0200
update TODO
diff --git a/TODO b/TODO
index 0bbee2f..27e3794 100644
--- a/TODO
+++ b/TODO
@@ -37,6 +37,8 @@ Features:
indicates that we are trying to acquire some configuration for a
link but haven't acquired any yet. Just to inform the admin that
networkd cares about an interface, but is still in progress..
+ - the DHCP lease data (such as NTP/DNS) is still made available when
+ a carrier is lost on a link. It should be removed instantly.
* resolved:
- DNSSEC
@@ -88,8 +90,6 @@ Features:
* timer units: actually add extra delays to timer units with high AccuracySec values, don't start them already when we are awake...
-* timesyncd - hookup with networkd: NTP servers from dhcp
-
* a way for container managers to turn off getty starting via $container_headless= or so...
* figure out a nice way how we can let the admin know what child/sibling unit causes cgroup membership for a specific unit
commit 7964ca43478d8c69263dd8de244131c97bb4cedd
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Aug 12 19:49:15 2014 +0200
man: minimal updates to resolved.conf man page
diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
index dc0e3b6..c44b10c 100644
--- a/man/systemd-resolved.service.xml
+++ b/man/systemd-resolved.service.xml
@@ -62,8 +62,10 @@
resolver and responder. It also generates
<filename>/run/systemd/resolve/resolv.conf</filename>
for compatibility which may be symlinked from
- <filename>/etc/resolv.conf</filename>. The DNS servers contacted
- are determined from the global settings in
+ <filename>/etc/resolv.conf</filename>.</para>
+
+ <para>The DNS servers contacted are determined from
+ the global settings in
<citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
the per-link static settings in
<filename>.network</filename> files, and the per-link
@@ -79,8 +81,8 @@
<refsect1>
<title>See Also</title>
<para>
- <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
</para>
commit 874ff7bf4d6fe693542209f127d23cd89adc499b
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Aug 12 19:48:24 2014 +0200
timesyncd: beef up NTP server selection logic, and acquire NTP servers from DHCP
diff --git a/Makefile-man.am b/Makefile-man.am
index c790946..562ecba 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1199,7 +1199,8 @@ endif
if ENABLE_TIMESYNCD
MANPAGES += \
- man/systemd-timesyncd.service.8
+ man/systemd-timesyncd.service.8 \
+ man/timesyncd.conf.5
MANPAGES_ALIAS += \
man/systemd-timesyncd.8
man/systemd-timesyncd.8: man/systemd-timesyncd.service.8
@@ -1688,6 +1689,7 @@ EXTRA_DIST += \
man/sysusers.d.xml \
man/telinit.xml \
man/timedatectl.xml \
+ man/timesyncd.conf.xml \
man/tmpfiles.d.xml \
man/udev.conf.xml \
man/udev.xml \
diff --git a/man/systemd-timesyncd.service.xml b/man/systemd-timesyncd.service.xml
index 9647c54..47e243c 100644
--- a/man/systemd-timesyncd.service.xml
+++ b/man/systemd-timesyncd.service.xml
@@ -65,12 +65,24 @@
subsequent reboots to ensure it
monotonically advances even if the system lacks a
battery-buffered RTC chip.</para>
+
+ <para>The NTP servers contacted are determined from
+ the global settings in
+ <citerefentry><refentrytitle>timesyncd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ the per-link static settings in
+ <filename>.network</filename> files, and the per-link
+ dynamic settings received over DHCP. See
+ <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ for more details.</para>
</refsect1>
<refsect1>
<title>See Also</title>
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>timesyncd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>timedatectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>localtime</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry project='man-pages'><refentrytitle>hwclock</refentrytitle><manvolnum>8</manvolnum></citerefentry>
diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml
new file mode 100644
index 0000000..aeb7182
--- /dev/null
+++ b/man/timesyncd.conf.xml
@@ -0,0 +1,115 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+ This file is part of systemd.
+
+ Copyright 2014 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="timesyncd.conf" conditional='ENABLE_TIMESYNCD'>
+ <refentryinfo>
+ <title>timesyncd.conf</title>
+ <productname>systemd</productname>
+
+ <authorgroup>
+ <author>
+ <contrib>Developer</contrib>
+ <firstname>Lennart</firstname>
+ <surname>Poettering</surname>
+ <email>lennart at poettering.net</email>
+ </author>
+ </authorgroup>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>timesyncd.conf</refentrytitle>
+ <manvolnum>5</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>timesyncd.conf</refname>
+ <refpurpose>Network Time Synchronization configuration file</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <para><filename>/etc/systemd/timesyncd.conf</filename></para>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>Description</title>
+
+ <para>When starting, systemd-timesyncd will read the
+ configuration file
+ <filename>timesyncd.conf</filename>. This
+ configuration file controls NTP network time
+ synchronization.</para>
+
+ </refsect1>
+
+ <refsect1>
+ <title>Options</title>
+
+ <variablelist class='network-directives'>
+
+ <varlistentry>
+ <term><varname>NTP=</varname></term>
+ <listitem><para>A space separated list
+ of NTP servers host names or IP
+ addresses. During runtime this list is
+ combined with any per-interface NTP
+ servers acquired from
+ <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. systemd-timesyncd
+ will contact all configured system or
+ per-interface servers in turn until
+ one is found that responds. This
+ setting defaults to the empty
+ list.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><varname>FallbackNTP=</varname></term>
+ <listitem><para>A space separated list
+ of NTP server host names or IP
+ addresses to be used as the fallback
+ NTP servers. Any per-interface NTP
+ servers obtained from
+ <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ take precedence over this setting, as
+ do any servers set via
+ <varname>NTP=</varname> above. This
+ setting is hence only used if no other
+ NTP server information is known. If
+ this option is not given, a
+ compiled-in list of NTP servers is
+ used instead.</para></listitem>
+ </varlistentry>
+
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-timesyncd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ </para>
+ </refsect1>
+
+</refentry>
diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c
index 5ec907b..4c2dcdb 100644
--- a/src/timesync/timesyncd-conf.c
+++ b/src/timesync/timesyncd-conf.c
@@ -19,9 +19,49 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "in-addr-util.h"
+
#include "timesyncd-manager.h"
+#include "timesyncd-server.h"
#include "timesyncd-conf.h"
+int manager_parse_server_string(Manager *m, ServerType type, const char *string) {
+ const char *word, *state;
+ size_t length;
+ ServerName *first;
+ int r;
+
+ assert(m);
+ assert(string);
+
+ first = type == SERVER_FALLBACK ? m->fallback_servers : m->system_servers;
+
+ FOREACH_WORD_QUOTED(word, length, string, state) {
+ char buffer[length+1];
+ bool found = false;
+ ServerName *n;
+
+ memcpy(buffer, word, length);
+ buffer[length] = 0;
+
+ /* Filter out duplicates */
+ LIST_FOREACH(names, n, first)
+ if (streq_ptr(n->string, buffer)) {
+ found = true;
+ break;
+ }
+
+ if (found)
+ continue;
+
+ r = server_name_new(m, NULL, type, buffer);
+ if (r < 0)
+ return r;
+ }
+
+ return 0;
+}
+
int config_parse_servers(
const char *unit,
const char *filename,
@@ -35,15 +75,30 @@ int config_parse_servers(
void *userdata) {
Manager *m = userdata;
+ int r;
assert(filename);
assert(lvalue);
assert(rvalue);
if (isempty(rvalue))
- manager_flush_names(m);
-
- manager_add_server_string(m, rvalue);
+ manager_flush_server_names(m, ltype);
+ else {
+ r = manager_parse_server_string(m, ltype, rvalue);
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, -r, "Failed to parse NTP server string '%s'. Ignoring.", rvalue);
+ return 0;
+ }
+ }
return 0;
}
+
+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,
+ false, false, true, m);
+}
diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h
index 2102599..56466fe 100644
--- a/src/timesync/timesyncd-conf.h
+++ b/src/timesync/timesyncd-conf.h
@@ -23,6 +23,12 @@
#include "conf-parser.h"
+#include "timesyncd-manager.h"
+
const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length);
+int manager_parse_server_string(Manager *m, ServerType type, const char *string);
+
int config_parse_servers(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+
+int manager_parse_config_file(Manager *m);
diff --git a/src/timesync/timesyncd-gperf.gperf b/src/timesync/timesyncd-gperf.gperf
index b97eec8..29a2cfe 100644
--- a/src/timesync/timesyncd-gperf.gperf
+++ b/src/timesync/timesyncd-gperf.gperf
@@ -14,4 +14,6 @@ struct ConfigPerfItem;
%struct-type
%includes
%%
-Time.Servers, config_parse_servers, 0, 0
+Time.NTP, config_parse_servers, SERVER_SYSTEM, 0
+Time.Servers, config_parse_servers, SERVER_SYSTEM, 0
+Time.FallbackNTP, config_parse_servers, SERVER_FALLBACK, 0
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index c93937e..bb8fcca 100644
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -734,33 +734,42 @@ static int manager_begin(Manager *m) {
return manager_send_request(m);
}
-static void server_name_flush_addresses(ServerName *n) {
- ServerAddress *a;
+void manager_set_server_name(Manager *m, ServerName *n) {
+ assert(m);
- assert(n);
+ if (m->current_server_name == n)
+ return;
- while ((a = n->addresses)) {
- LIST_REMOVE(addresses, n->addresses, a);
- free(a);
- }
-}
+ m->current_server_name = n;
+ m->current_server_address = NULL;
+
+ manager_disconnect(m);
-void manager_flush_names(Manager *m) {
- ServerName *n;
+ if (n)
+ log_debug("Selected server %s.", n->string);
+}
+void manager_set_server_address(Manager *m, ServerAddress *a) {
assert(m);
- while ((n = m->servers)) {
- LIST_REMOVE(names, m->servers, n);
- free(n->string);
- server_name_flush_addresses(n);
- free(n);
+ if (m->current_server_address == a)
+ return;
+
+ m->current_server_name = a ? a->name : NULL;
+ m->current_server_address = a;
+
+ manager_disconnect(m);
+
+ if (a) {
+ _cleanup_free_ char *pretty = NULL;
+ server_address_pretty(a, &pretty);
+ log_debug("Selected address %s of server %s.", strna(pretty), a->name->string);
}
}
static int manager_resolve_handler(sd_resolve_query *q, int ret, const struct addrinfo *ai, void *userdata) {
Manager *m = userdata;
- ServerAddress *a, *last = NULL;
+ int r;
assert(q);
assert(m);
@@ -775,31 +784,25 @@ static int manager_resolve_handler(sd_resolve_query *q, int ret, const struct ad
return manager_connect(m);
}
- server_name_flush_addresses(m->current_server_name);
-
for (; ai; ai = ai->ai_next) {
_cleanup_free_ char *pretty = NULL;
+ ServerAddress *a;
assert(ai->ai_addr);
assert(ai->ai_addrlen >= offsetof(struct sockaddr, sa_data));
- assert(ai->ai_addrlen <= sizeof(union sockaddr_union));
if (!IN_SET(ai->ai_addr->sa_family, AF_INET, AF_INET6)) {
log_warning("Unsuitable address protocol for %s", m->current_server_name->string);
continue;
}
- a = new0(ServerAddress, 1);
- if (!a)
- return log_oom();
-
- memcpy(&a->sockaddr, ai->ai_addr, ai->ai_addrlen);
- a->socklen = ai->ai_addrlen;
-
- LIST_INSERT_AFTER(addresses, m->current_server_name->addresses, last, a);
- last = a;
+ r = server_address_new(m->current_server_name, &a, (const union sockaddr_union*) ai->ai_addr, ai->ai_addrlen);
+ if (r < 0) {
+ log_error("Failed to add server address: %s", strerror(-r));
+ return r;
+ }
- sockaddr_pretty(&a->sockaddr.sa, a->socklen, true, &pretty);
+ server_address_pretty(a, &pretty);
log_debug("Resolved address %s for %s.", pretty, m->current_server_name->string);
}
@@ -810,12 +813,12 @@ static int manager_resolve_handler(sd_resolve_query *q, int ret, const struct ad
return manager_connect(m);
}
- m->current_server_address = m->current_server_name->addresses;
+ manager_set_server_address(m, m->current_server_name->addresses);
return manager_begin(m);
}
-static int manager_retry(sd_event_source *source, usec_t usec, void *userdata) {
+static int manager_retry_connect(sd_event_source *source, usec_t usec, void *userdata) {
Manager *m = userdata;
assert(m);
@@ -824,11 +827,6 @@ static int manager_retry(sd_event_source *source, usec_t usec, void *userdata) {
}
int manager_connect(Manager *m) {
-
- struct addrinfo hints = {
- .ai_flags = AI_NUMERICSERV|AI_ADDRCONFIG,
- .ai_socktype = SOCK_DGRAM,
- };
int r;
assert(m);
@@ -839,7 +837,7 @@ int manager_connect(Manager *m) {
if (!ratelimit_test(&m->ratelimit)) {
log_debug("Slowing down attempts to contact servers.");
- 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);
+ r = sd_event_add_time(m->event, &m->event_retry, clock_boottime_or_monotonic(), now(clock_boottime_or_monotonic()) + RETRY_USEC, 0, manager_retry_connect, m);
if (r < 0) {
log_error("Failed to create retry timer: %s", strerror(-r));
return r;
@@ -851,27 +849,57 @@ int manager_connect(Manager *m) {
/* If we already are operating on some address, switch to the
* next one. */
if (m->current_server_address && m->current_server_address->addresses_next)
- m->current_server_address = m->current_server_address->addresses_next;
+ manager_set_server_address(m, m->current_server_address->addresses_next);
else {
- /* Hmm, we are through all addresses, let's look for the next host instead */
- m->current_server_address = NULL;
+ struct addrinfo hints = {
+ .ai_flags = AI_NUMERICSERV|AI_ADDRCONFIG,
+ .ai_socktype = SOCK_DGRAM,
+ };
+ /* Hmm, we are through all addresses, let's look for the next host instead */
if (m->current_server_name && m->current_server_name->names_next)
- m->current_server_name = m->current_server_name->names_next;
+ manager_set_server_name(m, m->current_server_name->names_next);
else {
- if (!m->servers) {
- m->current_server_name = NULL;
+ ServerName *f;
+
+ /* Our current server name list is exhausted,
+ * let's find the next one to iterate. First
+ * we try the system list, then the link list.
+ * After having processed the link list we
+ * jump back to the system list. However, if
+ * both lists are empty, we change to the
+ * fallback list. */
+ if (!m->current_server_name || m->current_server_name->type == SERVER_LINK) {
+ f = m->system_servers;
+ if (!f)
+ f = m->link_servers;
+ } else {
+ f = m->link_servers;
+ if (!f)
+ f = m->system_servers;
+ }
+
+ if (!f)
+ f = m->fallback_servers;
+
+ if (!f) {
+ manager_set_server_name(m, NULL);
log_debug("No server found.");
return 0;
}
- m->current_server_name = m->servers;
+ manager_set_server_name(m, f);
}
/* Tell the resolver to reread /etc/resolv.conf, in
* case it changed. */
res_init();
+ /* Flush out any previously resolved addresses */
+ server_name_flush_addresses(m->current_server_name);
+
+ log_debug("Resolving %s...", m->current_server_name->string);
+
r = sd_resolve_getaddrinfo(m->resolve, &m->resolve_query, m->current_server_name->string, "123", &hints, manager_resolve_handler, m);
if (r < 0) {
log_error("Failed to create resolver: %s", strerror(-r));
@@ -888,52 +916,6 @@ int manager_connect(Manager *m) {
return 1;
}
-static int manager_add_server(Manager *m, const char *server) {
- ServerName *n, *tail;
-
- assert(m);
- assert(server);
-
- n = new0(ServerName, 1);
- if (!n)
- return -ENOMEM;
-
- n->string = strdup(server);
- if (!n->string) {
- free(n);
- return -ENOMEM;
- }
-
- LIST_FIND_TAIL(names, m->servers, tail);
- LIST_INSERT_AFTER(names, m->servers, tail, n);
-
- return 0;
-}
-
-int manager_add_server_string(Manager *m, const char *string) {
- const char *word, *state;
- size_t l;
- int r;
-
- assert(m);
- assert(string);
-
- FOREACH_WORD_QUOTED(word, l, string, state) {
- char t[l+1];
-
- memcpy(t, word, l);
- t[l] = 0;
-
- r = manager_add_server(m, t);
- if (r < 0)
- log_error("Failed to add server %s to configuration, ignoring: %s", t, strerror(-r));
- }
- if (!isempty(state))
- log_warning("Trailing garbage at the end of server list, ignoring.");
-
- return 0;
-}
-
void manager_disconnect(Manager *m) {
assert(m);
@@ -952,13 +934,30 @@ void manager_disconnect(Manager *m) {
sd_notifyf(false, "STATUS=Idle.");
}
+void manager_flush_server_names(Manager *m, ServerType t) {
+ assert(m);
+
+ if (t == SERVER_SYSTEM)
+ while (m->system_servers)
+ server_name_free(m->system_servers);
+
+ if (t == SERVER_LINK)
+ while (m->link_servers)
+ server_name_free(m->link_servers);
+
+ if (t == SERVER_FALLBACK)
+ while (m->fallback_servers)
+ server_name_free(m->fallback_servers);
+}
void manager_free(Manager *m) {
if (!m)
return;
manager_disconnect(m);
- manager_flush_names(m);
+ manager_flush_server_names(m, SERVER_SYSTEM);
+ manager_flush_server_names(m, SERVER_LINK);
+ manager_flush_server_names(m, SERVER_FALLBACK);
sd_event_source_unref(m->event_retry);
@@ -971,13 +970,47 @@ void manager_free(Manager *m) {
free(m);
}
-int manager_parse_config_file(Manager *m) {
+static int manager_network_read_link_servers(Manager *m) {
+ _cleanup_strv_free_ char **ntp = NULL;
+ ServerName *n, *nx;
+ char **i;
+ int r;
+
assert(m);
- return config_parse(NULL, "/etc/systemd/timesyncd.conf", NULL,
- "Time\0",
- config_item_perf_lookup, timesyncd_gperf_lookup,
- false, false, true, m);
+ r = sd_network_get_ntp(&ntp);
+ if (r < 0)
+ goto clear;
+
+ LIST_FOREACH(names, n, m->link_servers)
+ n->marked = true;
+
+ STRV_FOREACH(i, ntp) {
+ bool found = false;
+
+ LIST_FOREACH(names, n, m->link_servers)
+ if (streq(n->string, *i)) {
+ n->marked = false;
+ found = true;
+ break;
+ }
+
+ if (!found) {
+ r = server_name_new(m, NULL, SERVER_LINK, *i);
+ if (r < 0)
+ goto clear;
+ }
+ }
+
+ LIST_FOREACH_SAFE(names, n, nx, m->link_servers)
+ if (n->marked)
+ server_name_free(n);
+
+ return 0;
+
+clear:
+ manager_flush_server_names(m, SERVER_LINK);
+ return r;
}
static int manager_network_event_handler(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
@@ -989,11 +1022,13 @@ static int manager_network_event_handler(sd_event_source *s, int fd, uint32_t re
sd_network_monitor_flush(m->network_monitor);
+ manager_network_read_link_servers(m);
+
/* check if the machine is online */
online = network_is_online();
/* check if the client is currently connected */
- connected = m->server_socket >= 0;
+ connected = m->server_socket >= 0 || m->resolve_query;
if (connected && !online) {
log_info("No network connectivity, watching for changes.");
@@ -1051,7 +1086,7 @@ int manager_new(Manager **ret) {
RATELIMIT_INIT(m->ratelimit, RATELIMIT_INTERVAL_USEC, RATELIMIT_BURST);
- r = manager_add_server_string(m, NTP_SERVERS);
+ r = manager_parse_server_string(m, SERVER_FALLBACK, NTP_SERVERS);
if (r < 0)
return r;
@@ -1076,6 +1111,10 @@ int manager_new(Manager **ret) {
if (r < 0)
return r;
+ r = manager_network_read_link_servers(m);
+ if (r < 0)
+ return r;
+
*ret = m;
m = NULL;
diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h
index e6dd711..2345bf8 100644
--- a/src/timesync/timesyncd-manager.h
+++ b/src/timesync/timesyncd-manager.h
@@ -27,16 +27,17 @@
#include "list.h"
#include "socket-util.h"
#include "ratelimit.h"
-#include "timesyncd-server.h"
typedef struct Manager Manager;
+#include "timesyncd-server.h"
+
struct Manager {
sd_event *event;
sd_resolve *resolve;
+ LIST_HEAD(ServerName, system_servers);
LIST_HEAD(ServerName, link_servers);
- LIST_HEAD(ServerName, servers);
LIST_HEAD(ServerName, fallback_servers);
RateLimit ratelimit;
@@ -94,8 +95,9 @@ void manager_free(Manager *m);
DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
-int manager_parse_config_file(Manager *m);
-int manager_add_server_string(Manager *m, const char *string);
-void manager_flush_names(Manager *m);
+void manager_set_server_name(Manager *m, ServerName *n);
+void manager_set_server_address(Manager *m, ServerAddress *a);
+void manager_flush_server_names(Manager *m, ServerType t);
+
int manager_connect(Manager *m);
void manager_disconnect(Manager *m);
diff --git a/src/timesync/timesyncd-server.c b/src/timesync/timesyncd-server.c
index e3cb1bf..ec3fe1f 100644
--- a/src/timesync/timesyncd-server.c
+++ b/src/timesync/timesyncd-server.c
@@ -20,3 +20,132 @@
***/
#include "timesyncd-server.h"
+
+int server_address_new(
+ ServerName *n,
+ ServerAddress **ret,
+ const union sockaddr_union *sockaddr,
+ socklen_t socklen) {
+
+ ServerAddress *a, *tail;
+
+ assert(n);
+ assert(sockaddr);
+ assert(socklen >= offsetof(struct sockaddr, sa_data));
+ assert(socklen <= sizeof(union sockaddr_union));
+
+ a = new0(ServerAddress, 1);
+ if (!a)
+ return -ENOMEM;
+
+ memcpy(&a->sockaddr, sockaddr, socklen);
+ a->socklen = socklen;
+
+ LIST_FIND_TAIL(addresses, n->addresses, tail);
+ LIST_INSERT_AFTER(addresses, n->addresses, tail, a);
+ a->name = n;
+
+ if (ret)
+ *ret = a;
+
+ return 0;
+}
+
+ServerAddress* server_address_free(ServerAddress *a) {
+ if (!a)
+ return NULL;
+
+ if (a->name) {
+ LIST_REMOVE(addresses, a->name->addresses, a);
+
+ if (a->name->manager && a->name->manager->current_server_address == a)
+ manager_set_server_address(a->name->manager, NULL);
+ }
+
+ free(a);
+ return NULL;
+}
+
+int server_name_new(
+ Manager *m,
+ ServerName **ret,
+ ServerType type,
+ const char *string) {
+
+ ServerName *n, *tail;
+
+ assert(m);
+ assert(string);
+
+ n = new0(ServerName, 1);
+ if (!n)
+ return -ENOMEM;
+
+ n->type = type;
+ n->string = strdup(string);
+ if (!n->string) {
+ free(n);
+ return -ENOMEM;
+ }
+
+ if (type == SERVER_SYSTEM) {
+ LIST_FIND_TAIL(names, m->system_servers, tail);
+ LIST_INSERT_AFTER(names, m->system_servers, tail, n);
+ } else if (type == SERVER_LINK) {
+ LIST_FIND_TAIL(names, m->link_servers, tail);
+ LIST_INSERT_AFTER(names, m->link_servers, tail, n);
+ } else if (type == SERVER_FALLBACK) {
+ LIST_FIND_TAIL(names, m->fallback_servers, tail);
+ LIST_INSERT_AFTER(names, m->fallback_servers, tail, n);
+ } else
+ assert_not_reached("Unknown server type");
+
+ n->manager = m;
+
+ if (type != SERVER_FALLBACK &&
+ m->current_server_name &&
+ m->current_server_name->type == SERVER_FALLBACK)
+ manager_set_server_name(m, NULL);
+
+ log_debug("Added new server %s.", string);
+
+ if (ret)
+ *ret = n;
+
+ return 0;
+}
+
+ServerName *server_name_free(ServerName *n) {
+ if (!n)
+ return NULL;
+
+ server_name_flush_addresses(n);
+
+ if (n->manager) {
+ if (n->type == SERVER_SYSTEM)
+ LIST_REMOVE(names, n->manager->system_servers, n);
+ else if (n->type == SERVER_LINK)
+ LIST_REMOVE(names, n->manager->link_servers, n);
+ else if (n->type == SERVER_FALLBACK)
+ LIST_REMOVE(names, n->manager->fallback_servers, n);
+ else
+ assert_not_reached("Unknown server type");
+
+ if (n->manager->current_server_name == n)
+ manager_set_server_name(n->manager, NULL);
+ }
+
+ log_debug("Removed server %s.", n->string);
+
+ free(n->string);
+ free(n);
+
+ return NULL;
+}
+
+void server_name_flush_addresses(ServerName *n) {
+ assert(n);
+
+ while (n->addresses)
+ server_address_free(n->addresses);
+}
diff --git a/src/timesync/timesyncd-server.h b/src/timesync/timesyncd-server.h
index a1312bf..243b44a 100644
--- a/src/timesync/timesyncd-server.h
+++ b/src/timesync/timesyncd-server.h
@@ -21,24 +21,47 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "socket-util.h"
+#include "list.h"
+
typedef struct ServerAddress ServerAddress;
typedef struct ServerName ServerName;
-#include "socket-util.h"
-#include "list.h"
+typedef enum ServerType {
+ SERVER_SYSTEM,
+ SERVER_FALLBACK,
+ SERVER_LINK,
+} ServerType;
+
+#include "timesyncd-manager.h"
struct ServerAddress {
+ ServerName *name;
+
union sockaddr_union sockaddr;
socklen_t socklen;
+
LIST_FIELDS(ServerAddress, addresses);
};
struct ServerName {
+ Manager *manager;
+
+ ServerType type;
char *string;
+
+ bool marked:1;
+
LIST_HEAD(ServerAddress, addresses);
LIST_FIELDS(ServerName, names);
};
+int server_address_new(ServerName *n, ServerAddress **ret, const union sockaddr_union *sockaddr, socklen_t socklen);
+ServerAddress* server_address_free(ServerAddress *a);
static inline int server_address_pretty(ServerAddress *a, char **pretty) {
return sockaddr_pretty(&a->sockaddr.sa, a->socklen, true, pretty);
}
+
+int server_name_new(Manager *m, ServerName **ret, ServerType type,const char *string);
+ServerName *server_name_free(ServerName *n);
+void server_name_flush_addresses(ServerName *n);
diff --git a/src/timesync/timesyncd.conf.in b/src/timesync/timesyncd.conf.in
index a0caa1d..674a51d 100644
--- a/src/timesync/timesyncd.conf.in
+++ b/src/timesync/timesyncd.conf.in
@@ -8,4 +8,5 @@
# See timesyncd.conf(5) for details
[Time]
-#Servers=@NTP_SERVERS@
+#NTP=
+#FallbackNTP=@NTP_SERVERS@
commit 96e6e394431dcc1db52847be311e2c8e61d7a9d6
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Aug 12 19:33:09 2014 +0200
resolved: return exit code of event loop
diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index 892bb51..8235558 100644
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -97,6 +97,8 @@ int main(int argc, char *argv[]) {
goto finish;
}
+ sd_event_get_exit_code(m->event, &r);
+
finish:
sd_notify(false, "STATUS=Shutting down...");
commit 3e684349c2cead2e6fd2f816c34eb17daba23a49
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Aug 12 19:32:55 2014 +0200
resolved: unify logic how we flush out DNS servers we learnt
diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c
index ae3773f..63e87f8 100644
--- a/src/resolve/resolved-conf.c
+++ b/src/resolve/resolved-conf.c
@@ -81,7 +81,6 @@ int config_parse_dnsv(
void *userdata) {
Manager *m = userdata;
- DnsServer **l;
int r;
assert(filename);
@@ -89,19 +88,10 @@ int config_parse_dnsv(
assert(rvalue);
assert(m);
- if (ltype == DNS_SERVER_FALLBACK)
- l = &m->fallback_dns_servers;
- else
- l = &m->dns_servers;
-
- if (isempty(rvalue)) {
-
+ if (isempty(rvalue))
/* Empty assignment means clear the list */
- while (*l)
- dns_server_free(*l);
-
- } else {
-
+ manager_flush_dns_servers(m, ltype);
+ else {
/* Otherwise add to the list */
r = manager_parse_dns_server(m, ltype, rvalue);
if (r < 0) {
diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c
index 043f6b6..c99768b 100644
--- a/src/resolve/resolved-dns-server.c
+++ b/src/resolve/resolved-dns-server.c
@@ -64,9 +64,9 @@ int dns_server_new(
* we used so far was a fallback one? Then let's try to pick
* the new one */
if (type != DNS_SERVER_FALLBACK &&
- s->manager->current_dns_server &&
- s->manager->current_dns_server->type == DNS_SERVER_FALLBACK)
- manager_set_dns_server(s->manager, NULL);
+ m->current_dns_server &&
+ m->current_dns_server->type == DNS_SERVER_FALLBACK)
+ manager_set_dns_server(m, NULL);
if (ret)
*ret = s;
@@ -87,14 +87,14 @@ DnsServer* dns_server_free(DnsServer *s) {
LIST_REMOVE(servers, s->manager->fallback_dns_servers, s);
else
assert_not_reached("Unknown server type");
+
+ if (s->manager->current_dns_server == s)
+ manager_set_dns_server(s->manager, NULL);
}
if (s->link && s->link->current_dns_server == s)
link_set_dns_server(s->link, NULL);
- if (s->manager && s->manager->current_dns_server == s)
- manager_set_dns_server(s->manager, NULL);
-
free(s);
return NULL;
diff --git a/src/resolve/resolved-dns-server.h b/src/resolve/resolved-dns-server.h
index 5178a6b..f2361a8 100644
--- a/src/resolve/resolved-dns-server.h
+++ b/src/resolve/resolved-dns-server.h
@@ -26,15 +26,15 @@
typedef struct DnsServer DnsServer;
typedef enum DnsServerSource DnsServerSource;
-#include "resolved-manager.h"
-#include "resolved-link.h"
-
typedef enum DnsServerType {
DNS_SERVER_SYSTEM,
DNS_SERVER_FALLBACK,
DNS_SERVER_LINK,
} DnsServerType;
+#include "resolved-manager.h"
+#include "resolved-link.h"
+
struct DnsServer {
Manager *manager;
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 6bb0894..a2de2ed 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -536,10 +536,8 @@ Manager *manager_free(Manager *m) {
dns_scope_free(m->unicast_scope);
- while (m->dns_servers)
- dns_server_free(m->dns_servers);
- while (m->fallback_dns_servers)
- dns_server_free(m->fallback_dns_servers);
+ manager_flush_dns_servers(m, DNS_SERVER_SYSTEM);
+ manager_flush_dns_servers(m, DNS_SERVER_FALLBACK);
hashmap_free(m->links);
hashmap_free(m->dns_transactions);
@@ -1771,6 +1769,18 @@ void manager_verify_all(Manager *m) {
dns_zone_verify_all(&s->zone);
}
+void manager_flush_dns_servers(Manager *m, DnsServerType t) {
+ assert(m);
+
+ if (t == DNS_SERVER_SYSTEM)
+ while (m->dns_servers)
+ dns_server_free(m->dns_servers);
+
+ if (t == DNS_SERVER_FALLBACK)
+ while (m->fallback_dns_servers)
+ dns_server_free(m->fallback_dns_servers);
+}
+
static const char* const support_table[_SUPPORT_MAX] = {
[SUPPORT_NO] = "no",
[SUPPORT_YES] = "yes",
diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h
index f8cb91c..78cbfc0 100644
--- a/src/resolve/resolved-manager.h
+++ b/src/resolve/resolved-manager.h
@@ -151,6 +151,8 @@ DnsScope* manager_find_scope(Manager *m, DnsPacket *p);
void manager_verify_all(Manager *m);
+void manager_flush_dns_servers(Manager *m, DnsServerType t);
+
DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
#define EXTRA_CMSG_SPACE 1024
commit 96c76ac49c28ba397fc8db3a40505b875c65ef16
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Aug 12 19:29:38 2014 +0200
sd-resolve: scale number of threads by queries currently being processed, rather than number of queries currently referenced
This way a query that blocks for a longer time, and whose reference has
been dropped won't block subsequent lookups from finishing.
diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c
index 15f1938..fea695f 100644
--- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/sd-resolve/sd-resolve.c
@@ -87,7 +87,7 @@ struct sd_resolve {
unsigned current_id;
sd_resolve_query* query_array[QUERIES_MAX];
- unsigned n_queries, n_done;
+ unsigned n_queries, n_done, n_outstanding;
sd_event_source *event_source;
sd_event *event;
@@ -526,7 +526,7 @@ static int start_threads(sd_resolve *resolve, unsigned extra) {
unsigned n;
int r;
- n = resolve->n_queries + extra - resolve->n_done;
+ n = resolve->n_outstanding + extra;
n = CLAMP(n, WORKERS_MIN, WORKERS_MAX);
while (resolve->n_valid_workers < n) {
@@ -854,6 +854,9 @@ static int handle_response(sd_resolve *resolve, const Packet *packet, size_t len
return 0;
}
+ assert(resolve->n_outstanding > 0);
+ resolve->n_outstanding--;
+
q = lookup_query(resolve, resp->id);
if (!q)
return 0;
@@ -1099,6 +1102,8 @@ _public_ int sd_resolve_getaddrinfo(
return -errno;
}
+ resolve->n_outstanding++;
+
if (_q)
*_q = q;
@@ -1167,6 +1172,8 @@ _public_ int sd_resolve_getnameinfo(
return -errno;
}
+ resolve->n_outstanding++;
+
if (_q)
*_q = q;
@@ -1231,6 +1238,8 @@ static int resolve_res(
return -errno;
}
+ resolve->n_outstanding++;
+
if (_q)
*_q = q;
commit 85529c815b47c22839e0f148af67fd37e977cbfa
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Aug 12 19:29:27 2014 +0200
sd-resolve: fix allocation if query ids, never reuse them
diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c
index df63f1d..15f1938 100644
--- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/sd-resolve/sd-resolve.c
@@ -85,7 +85,7 @@ struct sd_resolve {
pthread_t workers[WORKERS_MAX];
unsigned n_valid_workers;
- unsigned current_id, current_index;
+ unsigned current_id;
sd_resolve_query* query_array[QUERIES_MAX];
unsigned n_queries, n_done;
@@ -1024,21 +1024,17 @@ static int alloc_query(sd_resolve *resolve, bool floating, sd_resolve_query **_q
if (r < 0)
return r;
- while (resolve->query_array[resolve->current_index]) {
- resolve->current_index++;
+ while (resolve->query_array[resolve->current_id % QUERIES_MAX])
resolve->current_id++;
- resolve->current_index %= QUERIES_MAX;
- }
-
- q = resolve->query_array[resolve->current_index] = new0(sd_resolve_query, 1);
+ q = resolve->query_array[resolve->current_id % QUERIES_MAX] = new0(sd_resolve_query, 1);
if (!q)
return -ENOMEM;
q->n_ref = 1;
q->resolve = resolve;
q->floating = floating;
- q->id = resolve->current_id;
+ q->id = resolve->current_id++;
if (!floating)
sd_resolve_ref(resolve);
commit 502fe44ea44fdbe2282fbe0625bb2e01777425c0
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Aug 12 19:28:32 2014 +0200
sd-resolve: keep floating query referenced while we access it
diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c
index 10f8ed2..df63f1d 100644
--- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/sd-resolve/sd-resolve.c
@@ -772,13 +772,15 @@ static int complete_query(sd_resolve *resolve, sd_resolve_query *q) {
assert_not_reached("Cannot complete unknown query type");
}
- resolve->current = sd_resolve_query_unref(q);
+ resolve->current = NULL;
if (q->floating) {
resolve_query_disconnect(q);
sd_resolve_query_unref(q);
}
+ sd_resolve_query_unref(q);
+
return r;
}
commit 84e51726a38e133ca42d2f30f0668d3921b210cb
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Aug 12 16:58:56 2014 +0200
timesyncd: split up into multiple source file
The source file got much too large, hence split up the sources into
multiple per-object files, similar in style to resolved.
diff --git a/Makefile.am b/Makefile.am
index 12f0e91..9100ff6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2441,7 +2441,8 @@ libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-login/sd-login.c \
src/libsystemd/sd-path/sd-path.c \
src/libsystemd/sd-network/sd-network.c \
- src/libsystemd/sd-network/network-util.h
+ src/libsystemd/sd-network/network-util.h \
+ src/libsystemd/sd-network/network-util.c
nodist_libsystemd_internal_la_SOURCES = \
src/libsystemd/libsystemd.sym \
@@ -4593,7 +4594,12 @@ EXTRA_DIST += \
if ENABLE_TIMESYNCD
systemd_timesyncd_SOURCES = \
src/timesync/timesyncd.c \
- src/timesync/timesyncd.h
+ src/timesync/timesyncd-manager.c \
+ src/timesync/timesyncd-manager.h \
+ src/timesync/timesyncd-conf.c \
+ src/timesync/timesyncd-conf.h \
+ src/timesync/timesyncd-server.c \
+ src/timesync/timesyncd-server.h
nodist_systemd_timesyncd_SOURCES = \
src/timesync/timesyncd-gperf.c
diff --git a/src/libsystemd/sd-network/network-util.c b/src/libsystemd/sd-network/network-util.c
new file mode 100644
index 0000000..48958e8
--- /dev/null
+++ b/src/libsystemd/sd-network/network-util.c
@@ -0,0 +1,37 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2014 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "strv.h"
+#include "network-util.h"
+
+bool network_is_online(void) {
+ _cleanup_free_ char *state = NULL;
+ int r;
+
+ r = sd_network_get_operational_state(&state);
+ 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;
+}
diff --git a/src/libsystemd/sd-network/network-util.h b/src/libsystemd/sd-network/network-util.h
index 139efc7..02bd545 100644
--- a/src/libsystemd/sd-network/network-util.h
+++ b/src/libsystemd/sd-network/network-util.h
@@ -25,5 +25,6 @@
#include "sd-network.h"
DEFINE_TRIVIAL_CLEANUP_FUNC(sd_network_monitor*, sd_network_monitor_unref);
-
#define _cleanup_network_monitor_unref_ _cleanup_(sd_network_monitor_unrefp)
+
+bool network_is_online(void);
diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c
new file mode 100644
index 0000000..5ec907b
--- /dev/null
+++ b/src/timesync/timesyncd-conf.c
@@ -0,0 +1,49 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2014 Kay Sievers, Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "timesyncd-manager.h"
+#include "timesyncd-conf.h"
+
+int config_parse_servers(
+ const char *unit,
+ const char *filename,
+ unsigned line,
+ const char *section,
+ unsigned section_line,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ Manager *m = userdata;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+
+ if (isempty(rvalue))
+ manager_flush_names(m);
+
+ manager_add_server_string(m, rvalue);
+
+ return 0;
+}
diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h
new file mode 100644
index 0000000..2102599
--- /dev/null
+++ b/src/timesync/timesyncd-conf.h
@@ -0,0 +1,28 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#pragma once
+
+/***
+ This file is part of systemd.
+
+ Copyright 2014 Kay Sievers, Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "conf-parser.h"
+
+const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length);
+
+int config_parse_servers(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
diff --git a/src/timesync/timesyncd-gperf.gperf b/src/timesync/timesyncd-gperf.gperf
index 887dc68..b97eec8 100644
--- a/src/timesync/timesyncd-gperf.gperf
+++ b/src/timesync/timesyncd-gperf.gperf
@@ -1,7 +1,7 @@
%{
#include <stddef.h>
#include "conf-parser.h"
-#include "timesyncd.h"
+#include "timesyncd-conf.h"
%}
struct ConfigPerfItem;
%null_strings
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
new file mode 100644
index 0000000..c93937e
--- /dev/null
+++ b/src/timesync/timesyncd-manager.c
@@ -0,0 +1,1083 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2014 Kay Sievers, Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdlib.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <time.h>
+#include <math.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <sys/timerfd.h>
+#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 "sparse-endian.h"
+#include "log.h"
+#include "socket-util.h"
+#include "list.h"
+#include "ratelimit.h"
+#include "strv.h"
+#include "conf-parser.h"
+#include "sd-daemon.h"
+#include "event-util.h"
+#include "network-util.h"
+#include "clock-util.h"
+#include "capability.h"
+#include "mkdir.h"
+#include "timesyncd-conf.h"
+#include "timesyncd-manager.h"
+
+#define TIME_T_MAX (time_t)((1UL << ((sizeof(time_t) << 3) - 1)) - 1)
+
+#ifndef ADJ_SETOFFSET
+#define ADJ_SETOFFSET 0x0100 /* add 'time' to current time */
+#endif
+
+/* expected accuracy of time synchronization; used to adjust the poll interval */
+#define NTP_ACCURACY_SEC 0.2
+
+/*
+ * "A client MUST NOT under any conditions use a poll interval less
+ * than 15 seconds."
+ */
+#define NTP_POLL_INTERVAL_MIN_SEC 32
+#define NTP_POLL_INTERVAL_MAX_SEC 2048
+
+/*
+ * Maximum delta in seconds which the system clock is gradually adjusted
+ * (slew) to approach the network time. Deltas larger that this are set by
+ * letting the system time jump. The kernel's limit for adjtime is 0.5s.
+ */
+#define NTP_MAX_ADJUST 0.4
+
+/* NTP protocol, packet header */
+#define NTP_LEAP_PLUSSEC 1
+#define NTP_LEAP_MINUSSEC 2
+#define NTP_LEAP_NOTINSYNC 3
+#define NTP_MODE_CLIENT 3
+#define NTP_MODE_SERVER 4
+#define NTP_FIELD_LEAP(f) (((f) >> 6) & 3)
+#define NTP_FIELD_VERSION(f) (((f) >> 3) & 7)
+#define NTP_FIELD_MODE(f) ((f) & 7)
+#define NTP_FIELD(l, v, m) (((l) << 6) | ((v) << 3) | (m))
+
+/*
+ * "NTP timestamps are represented as a 64-bit unsigned fixed-point number,
+ * in seconds relative to 0h on 1 January 1900."
+ */
+#define OFFSET_1900_1970 2208988800UL
+
+#define RETRY_USEC (30*USEC_PER_SEC)
+#define RATELIMIT_INTERVAL_USEC (10*USEC_PER_SEC)
+#define RATELIMIT_BURST 10
+
+#define TIMEOUT_USEC (10*USEC_PER_SEC)
+
+struct ntp_ts {
+ be32_t sec;
+ be32_t frac;
+} _packed_;
+
+struct ntp_ts_short {
+ be16_t sec;
+ be16_t frac;
+} _packed_;
+
+struct ntp_msg {
+ uint8_t field;
+ uint8_t stratum;
+ int8_t poll;
+ int8_t precision;
+ struct ntp_ts_short root_delay;
+ struct ntp_ts_short root_dispersion;
+ char refid[4];
+ struct ntp_ts reference_time;
+ struct ntp_ts origin_time;
+ struct ntp_ts recv_time;
+ struct ntp_ts trans_time;
+} _packed_;
+
+static int manager_arm_timer(Manager *m, usec_t next);
+static int manager_clock_watch_setup(Manager *m);
+
+static double ntp_ts_to_d(const struct ntp_ts *ts) {
+ return be32toh(ts->sec) + ((double)be32toh(ts->frac) / UINT_MAX);
+}
+
+static double ts_to_d(const struct timespec *ts) {
+ return ts->tv_sec + (1.0e-9 * ts->tv_nsec);
+}
+
+static double tv_to_d(const struct timeval *tv) {
+ return tv->tv_sec + (1.0e-6 * tv->tv_usec);
+}
+
+static double square(double d) {
+ return d * d;
+}
+
+static int manager_timeout(sd_event_source *source, usec_t usec, void *userdata) {
+ _cleanup_free_ char *pretty = NULL;
+ Manager *m = userdata;
+
+ assert(m);
+ assert(m->current_server_name);
+ assert(m->current_server_address);
+
+ 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);
+}
+
+static int manager_send_request(Manager *m) {
+ _cleanup_free_ char *pretty = NULL;
+ struct ntp_msg ntpmsg = {
+ /*
+ * "The client initializes the NTP message header, sends the request
+ * to the server, and strips the time of day from the Transmit
+ * Timestamp field of the reply. For this purpose, all the NTP
+ * header fields are set to 0, except the Mode, VN, and optional
+ * Transmit Timestamp fields."
+ */
+ .field = NTP_FIELD(0, 4, NTP_MODE_CLIENT),
+ };
+ ssize_t len;
+ int r;
+
+ assert(m);
+ assert(m->current_server_name);
+ assert(m->current_server_address);
+
+ m->event_timeout = sd_event_source_unref(m->event_timeout);
+
+ /*
+ * Set transmit timestamp, remember it; the server will send that back
+ * as the origin timestamp and we have an indication that this is the
+ * matching answer to our request.
+ *
+ * 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_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);
+
+ 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)) {
+ m->pending = true;
+ log_debug("Sent NTP request to %s (%s).", strna(pretty), m->current_server_name->string);
+ } else {
+ log_debug("Sending NTP request to %s (%s) failed: %m", strna(pretty), m->current_server_name->string);
+ return manager_connect(m);
+ }
+
+ /* 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;
+ } else
+ m->retry_interval = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
+
+ r = manager_arm_timer(m, m->retry_interval);
+ if (r < 0) {
+ log_error("Failed to rearm timer: %s", strerror(-r));
+ return r;
+ }
+
+ r = sd_event_add_time(
+ m->event,
+ &m->event_timeout,
+ 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));
+ return r;
+ }
+
+ return 0;
+}
+
+static int manager_timer(sd_event_source *source, usec_t usec, void *userdata) {
+ Manager *m = userdata;
+
+ assert(m);
+
+ return manager_send_request(m);
+}
+
+static int manager_arm_timer(Manager *m, usec_t next) {
+ int r;
+
+ assert(m);
+ assert(m->event_receive);
+
+ if (next == 0) {
+ m->event_timer = sd_event_source_unref(m->event_timer);
+ return 0;
+ }
+
+ if (m->event_timer) {
+ r = sd_event_source_set_time(m->event_timer, now(clock_boottime_or_monotonic()) + next);
+ if (r < 0)
+ return r;
+
+ return sd_event_source_set_enabled(m->event_timer, SD_EVENT_ONESHOT);
+ }
+
+ return sd_event_add_time(
+ m->event,
+ &m->event_timer,
+ clock_boottime_or_monotonic(),
+ now(clock_boottime_or_monotonic()) + next, 0,
+ manager_timer, m);
+}
+
+static int manager_clock_watch(sd_event_source *source, int fd, uint32_t revents, void *userdata) {
+ Manager *m = userdata;
+
+ assert(m);
+
+ /* rearm timer */
+ manager_clock_watch_setup(m);
+
+ /* skip our own jumps */
+ if (m->jumped) {
+ m->jumped = false;
+ return 0;
+ }
+
+ /* resync */
+ log_info("System time changed. Resyncing.");
+ m->poll_resync = true;
+
+ return manager_send_request(m);
+}
+
+/* wake up when the system time changes underneath us */
+static int manager_clock_watch_setup(Manager *m) {
+
+ struct itimerspec its = {
+ .it_value.tv_sec = TIME_T_MAX
+ };
+
+ int r;
+
+ assert(m);
+
+ m->event_clock_watch = sd_event_source_unref(m->event_clock_watch);
+ safe_close(m->clock_watch_fd);
+
+ m->clock_watch_fd = timerfd_create(CLOCK_REALTIME, TFD_NONBLOCK|TFD_CLOEXEC);
+ if (m->clock_watch_fd < 0) {
+ log_error("Failed to create timerfd: %m");
+ return -errno;
+ }
+
+ if (timerfd_settime(m->clock_watch_fd, TFD_TIMER_ABSTIME|TFD_TIMER_CANCEL_ON_SET, &its, NULL) < 0) {
+ log_error("Failed to set up timerfd: %m");
+ return -errno;
+ }
+
+ r = sd_event_add_io(m->event, &m->event_clock_watch, m->clock_watch_fd, EPOLLIN, manager_clock_watch, m);
+ if (r < 0) {
+ log_error("Failed to create clock watch event source: %s", strerror(-r));
+ return r;
+ }
+
+ return 0;
+}
+
+static int manager_adjust_clock(Manager *m, double offset, int leap_sec) {
+ struct timex tmx = {};
+ int r;
+
+ assert(m);
+
+ /*
+ * For small deltas, tell the kernel to gradually adjust the system
+ * clock to the NTP time, larger deltas are just directly set.
+ */
+ if (fabs(offset) < NTP_MAX_ADJUST) {
+ tmx.modes = ADJ_STATUS | ADJ_NANO | ADJ_OFFSET | ADJ_TIMECONST | ADJ_MAXERROR | ADJ_ESTERROR;
+ tmx.status = STA_PLL;
+ tmx.offset = offset * NSEC_PER_SEC;
+ tmx.constant = log2i(m->poll_interval_usec / USEC_PER_SEC) - 4;
+ tmx.maxerror = 0;
+ tmx.esterror = 0;
+ log_debug(" adjust (slew): %+.3f sec\n", offset);
+ } else {
+ tmx.modes = ADJ_STATUS | ADJ_NANO | ADJ_SETOFFSET;
+
+ /* ADJ_NANO uses nanoseconds in the microseconds field */
+ tmx.time.tv_sec = (long)offset;
+ tmx.time.tv_usec = (offset - tmx.time.tv_sec) * NSEC_PER_SEC;
+
+ /* the kernel expects -0.3s as {-1, 7000.000.000} */
+ if (tmx.time.tv_usec < 0) {
+ tmx.time.tv_sec -= 1;
+ tmx.time.tv_usec += NSEC_PER_SEC;
+ }
+
+ m->jumped = true;
+ log_debug(" adjust (jump): %+.3f sec\n", offset);
+ }
+
+ /*
+ * An unset STA_UNSYNC will enable the kernel's 11-minute mode,
+ * which syncs the system time periodically to the RTC.
+ *
+ * In case the RTC runs in local time, never touch the RTC,
+ * we have no way to properly handle daylight saving changes and
+ * mobile devices moving between time zones.
+ */
+ if (m->rtc_local_time)
+ tmx.status |= STA_UNSYNC;
+
+ switch (leap_sec) {
+ case 1:
+ tmx.status |= STA_INS;
+ break;
+ case -1:
+ tmx.status |= STA_DEL;
+ break;
+ }
+
+ r = clock_adjtime(CLOCK_REALTIME, &tmx);
+ 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.%03llu\n"
+ " constant : %li\n"
+ " offset : %+.3f sec\n"
+ " freq offset : %+li (%i ppm)\n",
+ tmx.status, tmx.status & STA_UNSYNC ? "unsync" : "sync",
+ 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);
+
+ return 0;
+}
+
+static bool manager_sample_spike_detection(Manager *m, double offset, double delay) {
+ unsigned int i, idx_cur, idx_new, idx_min;
+ double jitter;
+ double j;
+
+ assert(m);
+
+ m->packet_count++;
+
+ /* ignore initial sample */
+ if (m->packet_count == 1)
+ return false;
+
+ /* store the current data in our samples array */
+ idx_cur = m->samples_idx;
+ idx_new = (idx_cur + 1) % ELEMENTSOF(m->samples);
+ m->samples_idx = idx_new;
+ m->samples[idx_new].offset = offset;
+ m->samples[idx_new].delay = delay;
+
+ /* calculate new jitter value from the RMS differences relative to the lowest delay sample */
+ jitter = m->samples_jitter;
+ for (idx_min = idx_cur, i = 0; i < ELEMENTSOF(m->samples); i++)
+ if (m->samples[i].delay > 0 && m->samples[i].delay < m->samples[idx_min].delay)
+ idx_min = i;
+
+ j = 0;
+ for (i = 0; i < ELEMENTSOF(m->samples); i++)
+ j += square(m->samples[i].offset - m->samples[idx_min].offset);
+ m->samples_jitter = sqrt(j / (ELEMENTSOF(m->samples) - 1));
+
+ /* ignore samples when resyncing */
+ if (m->poll_resync)
+ return false;
+
+ /* always accept offset if we are farther off than the round-trip delay */
+ if (fabs(offset) > delay)
+ return false;
+
+ /* we need a few samples before looking at them */
+ if (m->packet_count < 4)
+ return false;
+
+ /* do not accept anything worse than the maximum possible error of the best sample */
+ if (fabs(offset) > m->samples[idx_min].delay)
+ return true;
+
+ /* compare the difference between the current offset to the previous offset and jitter */
+ return fabs(offset - m->samples[idx_cur].offset) > 3 * jitter;
+}
+
+static void manager_adjust_poll(Manager *m, double offset, bool spike) {
+ assert(m);
+
+ if (m->poll_resync) {
+ m->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
+ m->poll_resync = false;
+ return;
+ }
+
+ /* set to minimal poll interval */
+ if (!spike && fabs(offset) > NTP_ACCURACY_SEC) {
+ m->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
+ return;
+ }
+
+ /* increase polling interval */
+ if (fabs(offset) < NTP_ACCURACY_SEC * 0.25) {
+ if (m->poll_interval_usec < NTP_POLL_INTERVAL_MAX_SEC * USEC_PER_SEC)
+ m->poll_interval_usec *= 2;
+ return;
+ }
+
+ /* decrease polling interval */
+ if (spike || fabs(offset) > NTP_ACCURACY_SEC * 0.75) {
+ if (m->poll_interval_usec > NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC)
+ m->poll_interval_usec /= 2;
+ return;
+ }
+}
+
+static int manager_receive_response(sd_event_source *source, int fd, uint32_t revents, void *userdata) {
+ Manager *m = userdata;
+ struct ntp_msg ntpmsg;
+
+ struct iovec iov = {
+ .iov_base = &ntpmsg,
+ .iov_len = sizeof(ntpmsg),
+ };
+ union {
+ struct cmsghdr cmsghdr;
+ uint8_t buf[CMSG_SPACE(sizeof(struct timeval))];
+ } control;
+ union sockaddr_union server_addr;
+ struct msghdr msghdr = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ .msg_control = &control,
+ .msg_controllen = sizeof(control),
+ .msg_name = &server_addr,
+ .msg_namelen = sizeof(server_addr),
+ };
+ struct cmsghdr *cmsg;
+ struct timespec now_ts;
+ struct timeval *recv_time;
+ ssize_t len;
+ double origin, receive, trans, dest;
+ double delay, offset;
+ bool spike;
+ int leap_sec;
+ int r;
+
+ assert(source);
+ assert(m);
+
+ if (revents & (EPOLLHUP|EPOLLERR)) {
+ log_warning("Server connection returned error.");
+ return manager_connect(m);
+ }
+
+ len = recvmsg(fd, &msghdr, MSG_DONTWAIT);
+ if (len < 0) {
+ if (errno == EAGAIN)
+ return 0;
+
+ log_warning("Error receiving message. Disconnecting.");
+ return manager_connect(m);
+ }
+
+ if (iov.iov_len < sizeof(struct ntp_msg)) {
+ log_warning("Invalid response from server. Disconnecting.");
+ return manager_connect(m);
+ }
+
+ if (!m->current_server_name ||
+ !m->current_server_address ||
+ !sockaddr_equal(&server_addr, &m->current_server_address->sockaddr)) {
+ log_debug("Response from unknown server.");
+ return 0;
+ }
+
+ recv_time = NULL;
+ for (cmsg = CMSG_FIRSTHDR(&msghdr); cmsg; cmsg = CMSG_NXTHDR(&msghdr, cmsg)) {
+ if (cmsg->cmsg_level != SOL_SOCKET)
+ continue;
+
+ switch (cmsg->cmsg_type) {
+ case SCM_TIMESTAMP:
+ recv_time = (struct timeval *) CMSG_DATA(cmsg);
+ break;
+ }
+ }
+ if (!recv_time) {
+ log_error("Invalid packet timestamp.");
+ return -EINVAL;
+ }
+
+ if (!m->pending) {
+ log_debug("Unexpected reply. Ignoring.");
+ return 0;
+ }
+
+ /* check our "time cookie" (we just stored nanoseconds in the fraction field) */
+ if (be32toh(ntpmsg.origin_time.sec) != m->trans_time.tv_sec + OFFSET_1900_1970 ||
+ be32toh(ntpmsg.origin_time.frac) != m->trans_time.tv_nsec) {
+ log_debug("Invalid reply; not our transmit time. Ignoring.");
+ return 0;
+ }
+
+ m->event_timeout = sd_event_source_unref(m->event_timeout);
+
+ if (be32toh(ntpmsg.recv_time.sec) < TIME_EPOCH + OFFSET_1900_1970 ||
+ be32toh(ntpmsg.trans_time.sec) < TIME_EPOCH + OFFSET_1900_1970) {
+ log_debug("Invalid reply, returned times before epoch. Ignoring.");
+ return manager_connect(m);
+ }
+
+ if (NTP_FIELD_LEAP(ntpmsg.field) == NTP_LEAP_NOTINSYNC) {
+ log_debug("Server is not synchronized. Disconnecting.");
+ return manager_connect(m);
+ }
+
+ if (!IN_SET(NTP_FIELD_VERSION(ntpmsg.field), 3, 4)) {
+ log_debug("Response NTPv%d. Disconnecting.", NTP_FIELD_VERSION(ntpmsg.field));
+ return manager_connect(m);
+ }
+
+ if (NTP_FIELD_MODE(ntpmsg.field) != NTP_MODE_SERVER) {
+ log_debug("Unsupported mode %d. Disconnecting.", NTP_FIELD_MODE(ntpmsg.field));
+ return manager_connect(m);
+ }
+
+ /* valid packet */
+ m->pending = false;
+ m->retry_interval = 0;
+
+ /* announce leap seconds */
+ if (NTP_FIELD_LEAP(ntpmsg.field) & NTP_LEAP_PLUSSEC)
+ leap_sec = 1;
+ else if (NTP_FIELD_LEAP(ntpmsg.field) & NTP_LEAP_MINUSSEC)
+ leap_sec = -1;
+ else
+ leap_sec = 0;
+
+ /*
+ * "Timestamp Name ID When Generated
+ * ------------------------------------------------------------
+ * Originate Timestamp T1 time request sent by client
+ * Receive Timestamp T2 time request received by server
+ * Transmit Timestamp T3 time reply sent by server
+ * Destination Timestamp T4 time reply received by client
+ *
+ * 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_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);
+ dest = tv_to_d(recv_time) + OFFSET_1900_1970;
+
+ offset = ((receive - origin) + (trans - dest)) / 2;
+ delay = (dest - origin) - (trans - receive);
+
+ spike = manager_sample_spike_detection(m, offset, delay);
+
+ manager_adjust_poll(m, offset, spike);
+
+ log_debug("NTP response:\n"
+ " leap : %u\n"
+ " version : %u\n"
+ " mode : %u\n"
+ " stratum : %u\n"
+ " precision : %.6f sec (%d)\n"
+ " reference : %.4s\n"
+ " origin : %.3f\n"
+ " receive : %.3f\n"
+ " transmit : %.3f\n"
+ " dest : %.3f\n"
+ " offset : %+.3f sec\n"
+ " delay : %+.3f sec\n"
+ " packet count : %"PRIu64"\n"
+ " jitter : %.3f%s\n"
+ " poll interval: " USEC_FMT "\n",
+ NTP_FIELD_LEAP(ntpmsg.field),
+ NTP_FIELD_VERSION(ntpmsg.field),
+ NTP_FIELD_MODE(ntpmsg.field),
+ ntpmsg.stratum,
+ exp2(ntpmsg.precision), ntpmsg.precision,
+ ntpmsg.stratum == 1 ? ntpmsg.refid : "n/a",
+ origin - OFFSET_1900_1970,
+ receive - OFFSET_1900_1970,
+ trans - OFFSET_1900_1970,
+ dest - OFFSET_1900_1970,
+ offset, delay,
+ m->packet_count,
+ m->samples_jitter, spike ? " spike" : "",
+ 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 " 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)" : "");
+
+ r = manager_arm_timer(m, m->poll_interval_usec);
+ if (r < 0) {
+ log_error("Failed to rearm timer: %s", strerror(-r));
+ return r;
+ }
+
+ return 0;
+}
+
+static int manager_listen_setup(Manager *m) {
+ union sockaddr_union addr = {};
+ static const int tos = IPTOS_LOWDELAY;
+ static const int on = 1;
+ int r;
+
+ assert(m);
+
+ assert(m->server_socket < 0);
+ assert(!m->event_receive);
+ assert(m->current_server_address);
+
+ addr.sa.sa_family = m->current_server_address->sockaddr.sa.sa_family;
+
+ m->server_socket = socket(addr.sa.sa_family, SOCK_DGRAM | SOCK_CLOEXEC, 0);
+ if (m->server_socket < 0)
+ return -errno;
+
+ r = bind(m->server_socket, &addr.sa, m->current_server_address->socklen);
+ if (r < 0)
+ return -errno;
+
+ r = setsockopt(m->server_socket, SOL_SOCKET, SO_TIMESTAMP, &on, sizeof(on));
+ if (r < 0)
+ return -errno;
+
+ setsockopt(m->server_socket, IPPROTO_IP, IP_TOS, &tos, sizeof(tos));
+
+ return sd_event_add_io(m->event, &m->event_receive, m->server_socket, EPOLLIN, manager_receive_response, m);
+}
+
+static int manager_begin(Manager *m) {
+ _cleanup_free_ char *pretty = NULL;
+ int r;
+
+ assert(m);
+ assert_return(m->current_server_name, -EHOSTUNREACH);
+ assert_return(m->current_server_address, -EHOSTUNREACH);
+
+ m->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
+
+ 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);
+
+ r = manager_listen_setup(m);
+ if (r < 0) {
+ log_warning("Failed to setup connection socket: %s", strerror(-r));
+ return r;
+ }
+
+ r = manager_clock_watch_setup(m);
+ if (r < 0)
+ return r;
+
+ return manager_send_request(m);
+}
+
+static void server_name_flush_addresses(ServerName *n) {
+ ServerAddress *a;
+
+ assert(n);
+
+ while ((a = n->addresses)) {
+ LIST_REMOVE(addresses, n->addresses, a);
+ free(a);
+ }
+}
+
+void manager_flush_names(Manager *m) {
+ ServerName *n;
+
+ assert(m);
+
+ while ((n = m->servers)) {
+ LIST_REMOVE(names, m->servers, n);
+ free(n->string);
+ server_name_flush_addresses(n);
+ free(n);
+ }
+}
+
+static int manager_resolve_handler(sd_resolve_query *q, int ret, const struct addrinfo *ai, void *userdata) {
+ Manager *m = userdata;
+ ServerAddress *a, *last = NULL;
+
+ assert(q);
+ assert(m);
+ assert(m->current_server_name);
+
+ m->resolve_query = sd_resolve_query_unref(m->resolve_query);
+
+ if (ret != 0) {
+ log_debug("Failed to resolve %s: %s", m->current_server_name->string, gai_strerror(ret));
+
+ /* Try next host */
+ return manager_connect(m);
+ }
+
+ server_name_flush_addresses(m->current_server_name);
+
+ for (; ai; ai = ai->ai_next) {
+ _cleanup_free_ char *pretty = NULL;
+
+ assert(ai->ai_addr);
+ assert(ai->ai_addrlen >= offsetof(struct sockaddr, sa_data));
+ assert(ai->ai_addrlen <= sizeof(union sockaddr_union));
+
+ if (!IN_SET(ai->ai_addr->sa_family, AF_INET, AF_INET6)) {
+ log_warning("Unsuitable address protocol for %s", m->current_server_name->string);
+ continue;
+ }
+
+ a = new0(ServerAddress, 1);
+ if (!a)
+ return log_oom();
+
+ memcpy(&a->sockaddr, ai->ai_addr, ai->ai_addrlen);
+ a->socklen = ai->ai_addrlen;
+
+ LIST_INSERT_AFTER(addresses, m->current_server_name->addresses, last, a);
+ last = a;
+
+ sockaddr_pretty(&a->sockaddr.sa, a->socklen, true, &pretty);
+ log_debug("Resolved address %s for %s.", pretty, m->current_server_name->string);
+ }
+
+ if (!m->current_server_name->addresses) {
+ log_error("Failed to find suitable address for host %s.", m->current_server_name->string);
+
+ /* Try next host */
+ return manager_connect(m);
+ }
+
+ m->current_server_address = m->current_server_name->addresses;
+
+ return manager_begin(m);
+}
+
+static int manager_retry(sd_event_source *source, usec_t usec, void *userdata) {
+ Manager *m = userdata;
+
+ assert(m);
+
+ return manager_connect(m);
+}
+
+int manager_connect(Manager *m) {
+
+ struct addrinfo hints = {
+ .ai_flags = AI_NUMERICSERV|AI_ADDRCONFIG,
+ .ai_socktype = SOCK_DGRAM,
+ };
+ int r;
+
+ assert(m);
+
+ manager_disconnect(m);
+
+ m->event_retry = sd_event_source_unref(m->event_retry);
+ if (!ratelimit_test(&m->ratelimit)) {
+ log_debug("Slowing down attempts to contact servers.");
+
+ 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;
+ }
+
+ return 0;
+ }
+
+ /* If we already are operating on some address, switch to the
+ * next one. */
+ if (m->current_server_address && m->current_server_address->addresses_next)
+ m->current_server_address = m->current_server_address->addresses_next;
+ else {
+ /* Hmm, we are through all addresses, let's look for the next host instead */
+ m->current_server_address = NULL;
+
+ if (m->current_server_name && m->current_server_name->names_next)
+ m->current_server_name = m->current_server_name->names_next;
+ else {
+ if (!m->servers) {
+ m->current_server_name = NULL;
+ log_debug("No server found.");
+ return 0;
+ }
+
+ m->current_server_name = m->servers;
+ }
+
+ /* Tell the resolver to reread /etc/resolv.conf, in
+ * case it changed. */
+ res_init();
+
+ r = sd_resolve_getaddrinfo(m->resolve, &m->resolve_query, m->current_server_name->string, "123", &hints, manager_resolve_handler, m);
+ if (r < 0) {
+ log_error("Failed to create resolver: %s", strerror(-r));
+ return r;
+ }
+
+ return 1;
+ }
+
+ r = manager_begin(m);
+ if (r < 0)
+ return r;
+
+ return 1;
+}
+
+static int manager_add_server(Manager *m, const char *server) {
+ ServerName *n, *tail;
+
+ assert(m);
+ assert(server);
+
+ n = new0(ServerName, 1);
+ if (!n)
+ return -ENOMEM;
+
+ n->string = strdup(server);
+ if (!n->string) {
+ free(n);
+ return -ENOMEM;
+ }
+
+ LIST_FIND_TAIL(names, m->servers, tail);
+ LIST_INSERT_AFTER(names, m->servers, tail, n);
+
+ return 0;
+}
+
+int manager_add_server_string(Manager *m, const char *string) {
+ const char *word, *state;
+ size_t l;
+ int r;
+
+ assert(m);
+ assert(string);
+
+ FOREACH_WORD_QUOTED(word, l, string, state) {
+ char t[l+1];
+
+ memcpy(t, word, l);
+ t[l] = 0;
+
+ r = manager_add_server(m, t);
+ if (r < 0)
+ log_error("Failed to add server %s to configuration, ignoring: %s", t, strerror(-r));
+ }
+ if (!isempty(state))
+ log_warning("Trailing garbage at the end of server list, ignoring.");
+
+ return 0;
+}
+
+void manager_disconnect(Manager *m) {
+ assert(m);
+
+ m->resolve_query = sd_resolve_query_unref(m->resolve_query);
+
+ m->event_timer = sd_event_source_unref(m->event_timer);
+
+ m->event_receive = sd_event_source_unref(m->event_receive);
+ m->server_socket = safe_close(m->server_socket);
+
+ m->event_clock_watch = sd_event_source_unref(m->event_clock_watch);
+ m->clock_watch_fd = safe_close(m->clock_watch_fd);
+
+ m->event_timeout = sd_event_source_unref(m->event_timeout);
+
+ sd_notifyf(false, "STATUS=Idle.");
+}
+
+
+void manager_free(Manager *m) {
+ if (!m)
+ return;
+
+ manager_disconnect(m);
+ manager_flush_names(m);
+
+ 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);
+
+ free(m);
+}
+
+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,
+ false, false, true, m);
+}
+
+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 >= 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)
+ r = manager_begin(m);
+ else
+ r = manager_connect(m);
+ if (r < 0)
+ return r;
+ }
+
+ return 0;
+}
+
+static int manager_network_monitor_listen(Manager *m) {
+ int r, fd, events;
+
+ assert(m);
+
+ r = sd_network_monitor_new(&m->network_monitor, NULL);
+ if (r < 0)
+ return r;
+
+ fd = sd_network_monitor_get_fd(m->network_monitor);
+ if (fd < 0)
+ return fd;
+
+ events = sd_network_monitor_get_events(m->network_monitor);
+ if (events < 0)
+ return events;
+
+ r = sd_event_add_io(m->event, &m->network_event_source, fd, events, manager_network_event_handler, m);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+int manager_new(Manager **ret) {
+ _cleanup_(manager_freep) Manager *m = NULL;
+ int r;
+
+ assert(ret);
+
+ m = new0(Manager, 1);
+ if (!m)
+ return -ENOMEM;
+
+ m->server_socket = m->clock_watch_fd = -1;
+
+ RATELIMIT_INIT(m->ratelimit, RATELIMIT_INTERVAL_USEC, RATELIMIT_BURST);
+
+ r = manager_add_server_string(m, NTP_SERVERS);
+ if (r < 0)
+ return r;
+
+ r = sd_event_default(&m->event);
+ if (r < 0)
+ return r;
+
+ sd_event_add_signal(m->event, NULL, SIGTERM, NULL, NULL);
+ sd_event_add_signal(m->event, NULL, SIGINT, NULL, NULL);
+
+ sd_event_set_watchdog(m->event, true);
+
+ 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 r;
+
+ r = manager_network_monitor_listen(m);
+ if (r < 0)
+ return r;
+
+ *ret = m;
+ m = NULL;
+
+ return 0;
+}
diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h
new file mode 100644
index 0000000..e6dd711
--- /dev/null
+++ b/src/timesync/timesyncd-manager.h
@@ -0,0 +1,101 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#pragma once
+
+/***
+ This file is part of systemd.
+
+ Copyright 2014 Kay Sievers, Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "sd-event.h"
+#include "sd-resolve.h"
+#include "sd-network.h"
+#include "list.h"
+#include "socket-util.h"
+#include "ratelimit.h"
+#include "timesyncd-server.h"
+
+typedef struct Manager Manager;
+
+struct Manager {
+ sd_event *event;
+ sd_resolve *resolve;
+
+ LIST_HEAD(ServerName, link_servers);
+ LIST_HEAD(ServerName, servers);
+ LIST_HEAD(ServerName, fallback_servers);
+
+ RateLimit ratelimit;
+
+ /* network */
+ sd_event_source *network_event_source;
+ sd_network_monitor *network_monitor;
+
+ /* peer */
+ sd_resolve_query *resolve_query;
+ sd_event_source *event_receive;
+ ServerName *current_server_name;
+ ServerAddress *current_server_address;
+ int server_socket;
+ uint64_t packet_count;
+ sd_event_source *event_timeout;
+
+ /* last sent packet */
+ struct timespec trans_time_mon;
+ struct timespec trans_time;
+ usec_t retry_interval;
+ bool pending;
+
+ /* poll timer */
+ sd_event_source *event_timer;
+ usec_t poll_interval_usec;
+ bool poll_resync;
+
+ /* history data */
+ struct {
+ double offset;
+ double delay;
+ } samples[8];
+ unsigned int samples_idx;
+ double samples_jitter;
+
+ /* last change */
+ bool jumped;
+ bool sync;
+ int drift_ppm;
+
+ /* watch for time changes */
+ sd_event_source *event_clock_watch;
+ int clock_watch_fd;
+
+ /* Retry connections */
+ sd_event_source *event_retry;
+
+ /* RTC runs in local time, leave it alone */
+ bool rtc_local_time;
+};
+
+int manager_new(Manager **ret);
+void manager_free(Manager *m);
+
+DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
+
+int manager_parse_config_file(Manager *m);
+int manager_add_server_string(Manager *m, const char *string);
+void manager_flush_names(Manager *m);
+int manager_connect(Manager *m);
+void manager_disconnect(Manager *m);
diff --git a/src/timesync/timesyncd-server.c b/src/timesync/timesyncd-server.c
new file mode 100644
index 0000000..e3cb1bf
--- /dev/null
+++ b/src/timesync/timesyncd-server.c
@@ -0,0 +1,22 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2014 Kay Sievers, Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "timesyncd-server.h"
diff --git a/src/timesync/timesyncd-server.h b/src/timesync/timesyncd-server.h
new file mode 100644
index 0000000..a1312bf
--- /dev/null
+++ b/src/timesync/timesyncd-server.h
@@ -0,0 +1,44 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#pragma once
+
+/***
+ This file is part of systemd.
+
+ Copyright 2014 Kay Sievers, Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+typedef struct ServerAddress ServerAddress;
+typedef struct ServerName ServerName;
+
+#include "socket-util.h"
+#include "list.h"
+
+struct ServerAddress {
+ union sockaddr_union sockaddr;
+ socklen_t socklen;
+ LIST_FIELDS(ServerAddress, addresses);
+};
+
+struct ServerName {
+ char *string;
+ LIST_HEAD(ServerAddress, addresses);
+ LIST_FIELDS(ServerName, names);
+};
+
+static inline int server_address_pretty(ServerAddress *a, char **pretty) {
+ return sockaddr_pretty(&a->sockaddr.sa, a->socklen, true, pretty);
+}
diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 500f83f..351bfd0 100644
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -19,138 +19,15 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <stdlib.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <time.h>
-#include <math.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <sys/timerfd.h>
-#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 "sparse-endian.h"
-#include "log.h"
-#include "socket-util.h"
-#include "list.h"
-#include "ratelimit.h"
-#include "strv.h"
-#include "conf-parser.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)
-
-#ifndef ADJ_SETOFFSET
-#define ADJ_SETOFFSET 0x0100 /* add 'time' to current time */
-#endif
-
-/* expected accuracy of time synchronization; used to adjust the poll interval */
-#define NTP_ACCURACY_SEC 0.2
-
-/*
- * "A client MUST NOT under any conditions use a poll interval less
- * than 15 seconds."
- */
-#define NTP_POLL_INTERVAL_MIN_SEC 32
-#define NTP_POLL_INTERVAL_MAX_SEC 2048
-
-/*
- * Maximum delta in seconds which the system clock is gradually adjusted
- * (slew) to approach the network time. Deltas larger that this are set by
- * letting the system time jump. The kernel's limit for adjtime is 0.5s.
- */
-#define NTP_MAX_ADJUST 0.4
-
-/* NTP protocol, packet header */
-#define NTP_LEAP_PLUSSEC 1
-#define NTP_LEAP_MINUSSEC 2
-#define NTP_LEAP_NOTINSYNC 3
-#define NTP_MODE_CLIENT 3
-#define NTP_MODE_SERVER 4
-#define NTP_FIELD_LEAP(f) (((f) >> 6) & 3)
-#define NTP_FIELD_VERSION(f) (((f) >> 3) & 7)
-#define NTP_FIELD_MODE(f) ((f) & 7)
-#define NTP_FIELD(l, v, m) (((l) << 6) | ((v) << 3) | (m))
-
-/*
- * "NTP timestamps are represented as a 64-bit unsigned fixed-point number,
- * in seconds relative to 0h on 1 January 1900."
- */
-#define OFFSET_1900_1970 2208988800UL
-
-#define RETRY_USEC (30*USEC_PER_SEC)
-#define RATELIMIT_INTERVAL_USEC (10*USEC_PER_SEC)
-#define RATELIMIT_BURST 10
-
-#define TIMEOUT_USEC (10*USEC_PER_SEC)
-
-struct ntp_ts {
- be32_t sec;
- be32_t frac;
-} _packed_;
-
-struct ntp_ts_short {
- be16_t sec;
- be16_t frac;
-} _packed_;
-
-struct ntp_msg {
- uint8_t field;
- uint8_t stratum;
- int8_t poll;
- int8_t precision;
- struct ntp_ts_short root_delay;
- struct ntp_ts_short root_dispersion;
- char refid[4];
- struct ntp_ts reference_time;
- struct ntp_ts origin_time;
- struct ntp_ts recv_time;
- struct ntp_ts trans_time;
-} _packed_;
-
-static void manager_free(Manager *m);
-DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
-#define _cleanup_manager_free_ _cleanup_(manager_freep)
-
-static int manager_arm_timer(Manager *m, usec_t next);
-static int manager_clock_watch_setup(Manager *m);
-static int manager_connect(Manager *m);
-static void manager_disconnect(Manager *m);
-
-static double ntp_ts_to_d(const struct ntp_ts *ts) {
- return be32toh(ts->sec) + ((double)be32toh(ts->frac) / UINT_MAX);
-}
-
-static double ts_to_d(const struct timespec *ts) {
- return ts->tv_sec + (1.0e-9 * ts->tv_nsec);
-}
-
-static double tv_to_d(const struct timeval *tv) {
- return tv->tv_sec + (1.0e-6 * tv->tv_usec);
-}
+#include "capability.h"
+#include "clock-util.h"
+#include "network-util.h"
-static double square(double d) {
- return d * d;
-}
+#include "timesyncd-manager.h"
+#include "timesyncd-conf.h"
static int load_clock_timestamp(uid_t uid, gid_t gid) {
_cleanup_close_ int fd = -1;
@@ -202,985 +79,13 @@ static int load_clock_timestamp(uid_t uid, gid_t gid) {
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);
- assert(m->current_server_name);
- assert(m->current_server_address);
-
- 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);
-}
-
-static int manager_send_request(Manager *m) {
- _cleanup_free_ char *pretty = NULL;
- struct ntp_msg ntpmsg = {
- /*
- * "The client initializes the NTP message header, sends the request
- * to the server, and strips the time of day from the Transmit
- * Timestamp field of the reply. For this purpose, all the NTP
- * header fields are set to 0, except the Mode, VN, and optional
- * Transmit Timestamp fields."
- */
- .field = NTP_FIELD(0, 4, NTP_MODE_CLIENT),
- };
- ssize_t len;
- int r;
-
- assert(m);
- assert(m->current_server_name);
- assert(m->current_server_address);
-
- m->event_timeout = sd_event_source_unref(m->event_timeout);
-
- /*
- * Set transmit timestamp, remember it; the server will send that back
- * as the origin timestamp and we have an indication that this is the
- * matching answer to our request.
- *
- * 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_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);
-
- 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)) {
- m->pending = true;
- log_debug("Sent NTP request to %s (%s).", strna(pretty), m->current_server_name->string);
- } else {
- log_debug("Sending NTP request to %s (%s) failed: %m", strna(pretty), m->current_server_name->string);
- return manager_connect(m);
- }
-
- /* 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;
- } else
- m->retry_interval = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
-
- r = manager_arm_timer(m, m->retry_interval);
- if (r < 0) {
- log_error("Failed to rearm timer: %s", strerror(-r));
- return r;
- }
-
- r = sd_event_add_time(
- m->event,
- &m->event_timeout,
- 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));
- return r;
- }
-
- return 0;
-}
-
-static int manager_timer(sd_event_source *source, usec_t usec, void *userdata) {
- Manager *m = userdata;
-
- assert(m);
-
- return manager_send_request(m);
-}
-
-static int manager_arm_timer(Manager *m, usec_t next) {
- int r;
-
- assert(m);
- assert(m->event_receive);
-
- if (next == 0) {
- m->event_timer = sd_event_source_unref(m->event_timer);
- return 0;
- }
-
- if (m->event_timer) {
- r = sd_event_source_set_time(m->event_timer, now(clock_boottime_or_monotonic()) + next);
- if (r < 0)
- return r;
-
- return sd_event_source_set_enabled(m->event_timer, SD_EVENT_ONESHOT);
- }
-
- return sd_event_add_time(
- m->event,
- &m->event_timer,
- clock_boottime_or_monotonic(),
- now(clock_boottime_or_monotonic()) + next, 0,
- manager_timer, m);
-}
-
-static int manager_clock_watch(sd_event_source *source, int fd, uint32_t revents, void *userdata) {
- Manager *m = userdata;
-
- assert(m);
-
- /* rearm timer */
- manager_clock_watch_setup(m);
-
- /* skip our own jumps */
- if (m->jumped) {
- m->jumped = false;
- return 0;
- }
-
- /* resync */
- log_info("System time changed. Resyncing.");
- m->poll_resync = true;
-
- return manager_send_request(m);
-}
-
-/* wake up when the system time changes underneath us */
-static int manager_clock_watch_setup(Manager *m) {
-
- struct itimerspec its = {
- .it_value.tv_sec = TIME_T_MAX
- };
-
- int r;
-
- assert(m);
-
- m->event_clock_watch = sd_event_source_unref(m->event_clock_watch);
- safe_close(m->clock_watch_fd);
-
- m->clock_watch_fd = timerfd_create(CLOCK_REALTIME, TFD_NONBLOCK|TFD_CLOEXEC);
- if (m->clock_watch_fd < 0) {
- log_error("Failed to create timerfd: %m");
- return -errno;
- }
-
- if (timerfd_settime(m->clock_watch_fd, TFD_TIMER_ABSTIME|TFD_TIMER_CANCEL_ON_SET, &its, NULL) < 0) {
- log_error("Failed to set up timerfd: %m");
- return -errno;
- }
-
- r = sd_event_add_io(m->event, &m->event_clock_watch, m->clock_watch_fd, EPOLLIN, manager_clock_watch, m);
- if (r < 0) {
- log_error("Failed to create clock watch event source: %s", strerror(-r));
- return r;
- }
-
- return 0;
-}
-
-static int manager_adjust_clock(Manager *m, double offset, int leap_sec) {
- struct timex tmx = {};
- int r;
-
- assert(m);
-
- /*
- * For small deltas, tell the kernel to gradually adjust the system
- * clock to the NTP time, larger deltas are just directly set.
- */
- if (fabs(offset) < NTP_MAX_ADJUST) {
- tmx.modes = ADJ_STATUS | ADJ_NANO | ADJ_OFFSET | ADJ_TIMECONST | ADJ_MAXERROR | ADJ_ESTERROR;
- tmx.status = STA_PLL;
- tmx.offset = offset * NSEC_PER_SEC;
- tmx.constant = log2i(m->poll_interval_usec / USEC_PER_SEC) - 4;
- tmx.maxerror = 0;
- tmx.esterror = 0;
- log_debug(" adjust (slew): %+.3f sec\n", offset);
- } else {
- tmx.modes = ADJ_STATUS | ADJ_NANO | ADJ_SETOFFSET;
-
- /* ADJ_NANO uses nanoseconds in the microseconds field */
- tmx.time.tv_sec = (long)offset;
- tmx.time.tv_usec = (offset - tmx.time.tv_sec) * NSEC_PER_SEC;
-
- /* the kernel expects -0.3s as {-1, 7000.000.000} */
- if (tmx.time.tv_usec < 0) {
- tmx.time.tv_sec -= 1;
- tmx.time.tv_usec += NSEC_PER_SEC;
- }
-
- m->jumped = true;
- log_debug(" adjust (jump): %+.3f sec\n", offset);
- }
-
- /*
- * An unset STA_UNSYNC will enable the kernel's 11-minute mode,
- * which syncs the system time periodically to the RTC.
- *
- * In case the RTC runs in local time, never touch the RTC,
- * we have no way to properly handle daylight saving changes and
- * mobile devices moving between time zones.
- */
- if (m->rtc_local_time)
- tmx.status |= STA_UNSYNC;
-
- switch (leap_sec) {
- case 1:
- tmx.status |= STA_INS;
- break;
- case -1:
- tmx.status |= STA_DEL;
- break;
- }
-
- r = clock_adjtime(CLOCK_REALTIME, &tmx);
- 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.%03llu\n"
- " constant : %li\n"
- " offset : %+.3f sec\n"
- " freq offset : %+li (%i ppm)\n",
- tmx.status, tmx.status & STA_UNSYNC ? "unsync" : "sync",
- 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);
-
- return 0;
-}
-
-static bool manager_sample_spike_detection(Manager *m, double offset, double delay) {
- unsigned int i, idx_cur, idx_new, idx_min;
- double jitter;
- double j;
-
- assert(m);
-
- m->packet_count++;
-
- /* ignore initial sample */
- if (m->packet_count == 1)
- return false;
-
- /* store the current data in our samples array */
- idx_cur = m->samples_idx;
- idx_new = (idx_cur + 1) % ELEMENTSOF(m->samples);
- m->samples_idx = idx_new;
- m->samples[idx_new].offset = offset;
- m->samples[idx_new].delay = delay;
-
- /* calculate new jitter value from the RMS differences relative to the lowest delay sample */
- jitter = m->samples_jitter;
- for (idx_min = idx_cur, i = 0; i < ELEMENTSOF(m->samples); i++)
- if (m->samples[i].delay > 0 && m->samples[i].delay < m->samples[idx_min].delay)
- idx_min = i;
-
- j = 0;
- for (i = 0; i < ELEMENTSOF(m->samples); i++)
- j += square(m->samples[i].offset - m->samples[idx_min].offset);
- m->samples_jitter = sqrt(j / (ELEMENTSOF(m->samples) - 1));
-
- /* ignore samples when resyncing */
- if (m->poll_resync)
- return false;
-
- /* always accept offset if we are farther off than the round-trip delay */
- if (fabs(offset) > delay)
- return false;
-
- /* we need a few samples before looking at them */
- if (m->packet_count < 4)
- return false;
-
- /* do not accept anything worse than the maximum possible error of the best sample */
- if (fabs(offset) > m->samples[idx_min].delay)
- return true;
-
- /* compare the difference between the current offset to the previous offset and jitter */
- return fabs(offset - m->samples[idx_cur].offset) > 3 * jitter;
-}
-
-static void manager_adjust_poll(Manager *m, double offset, bool spike) {
- assert(m);
-
- if (m->poll_resync) {
- m->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
- m->poll_resync = false;
- return;
- }
-
- /* set to minimal poll interval */
- if (!spike && fabs(offset) > NTP_ACCURACY_SEC) {
- m->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
- return;
- }
-
- /* increase polling interval */
- if (fabs(offset) < NTP_ACCURACY_SEC * 0.25) {
- if (m->poll_interval_usec < NTP_POLL_INTERVAL_MAX_SEC * USEC_PER_SEC)
- m->poll_interval_usec *= 2;
- return;
- }
-
- /* decrease polling interval */
- if (spike || fabs(offset) > NTP_ACCURACY_SEC * 0.75) {
- if (m->poll_interval_usec > NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC)
- m->poll_interval_usec /= 2;
- return;
- }
-}
-
-static int manager_receive_response(sd_event_source *source, int fd, uint32_t revents, void *userdata) {
- Manager *m = userdata;
- struct ntp_msg ntpmsg;
-
- struct iovec iov = {
- .iov_base = &ntpmsg,
- .iov_len = sizeof(ntpmsg),
- };
- union {
- struct cmsghdr cmsghdr;
- uint8_t buf[CMSG_SPACE(sizeof(struct timeval))];
- } control;
- union sockaddr_union server_addr;
- struct msghdr msghdr = {
- .msg_iov = &iov,
- .msg_iovlen = 1,
- .msg_control = &control,
- .msg_controllen = sizeof(control),
- .msg_name = &server_addr,
- .msg_namelen = sizeof(server_addr),
- };
- struct cmsghdr *cmsg;
- struct timespec now_ts;
- struct timeval *recv_time;
- ssize_t len;
- double origin, receive, trans, dest;
- double delay, offset;
- bool spike;
- int leap_sec;
- int r;
-
- assert(source);
- assert(m);
-
- if (revents & (EPOLLHUP|EPOLLERR)) {
- log_warning("Server connection returned error.");
- return manager_connect(m);
- }
-
- len = recvmsg(fd, &msghdr, MSG_DONTWAIT);
- if (len < 0) {
- if (errno == EAGAIN)
- return 0;
-
- log_warning("Error receiving message. Disconnecting.");
- return manager_connect(m);
- }
-
- if (iov.iov_len < sizeof(struct ntp_msg)) {
- log_warning("Invalid response from server. Disconnecting.");
- return manager_connect(m);
- }
-
- if (!m->current_server_name ||
- !m->current_server_address ||
- !sockaddr_equal(&server_addr, &m->current_server_address->sockaddr)) {
- log_debug("Response from unknown server.");
- return 0;
- }
-
- recv_time = NULL;
- for (cmsg = CMSG_FIRSTHDR(&msghdr); cmsg; cmsg = CMSG_NXTHDR(&msghdr, cmsg)) {
- if (cmsg->cmsg_level != SOL_SOCKET)
- continue;
-
- switch (cmsg->cmsg_type) {
- case SCM_TIMESTAMP:
- recv_time = (struct timeval *) CMSG_DATA(cmsg);
- break;
- }
- }
- if (!recv_time) {
- log_error("Invalid packet timestamp.");
- return -EINVAL;
- }
-
- if (!m->pending) {
- log_debug("Unexpected reply. Ignoring.");
- return 0;
- }
-
- /* check our "time cookie" (we just stored nanoseconds in the fraction field) */
- if (be32toh(ntpmsg.origin_time.sec) != m->trans_time.tv_sec + OFFSET_1900_1970 ||
- be32toh(ntpmsg.origin_time.frac) != m->trans_time.tv_nsec) {
- log_debug("Invalid reply; not our transmit time. Ignoring.");
- return 0;
- }
-
- m->event_timeout = sd_event_source_unref(m->event_timeout);
-
- if (be32toh(ntpmsg.recv_time.sec) < TIME_EPOCH + OFFSET_1900_1970 ||
- be32toh(ntpmsg.trans_time.sec) < TIME_EPOCH + OFFSET_1900_1970) {
- log_debug("Invalid reply, returned times before epoch. Ignoring.");
- return manager_connect(m);
- }
-
- if (NTP_FIELD_LEAP(ntpmsg.field) == NTP_LEAP_NOTINSYNC) {
- log_debug("Server is not synchronized. Disconnecting.");
- return manager_connect(m);
- }
-
- if (!IN_SET(NTP_FIELD_VERSION(ntpmsg.field), 3, 4)) {
- log_debug("Response NTPv%d. Disconnecting.", NTP_FIELD_VERSION(ntpmsg.field));
- return manager_connect(m);
- }
-
- if (NTP_FIELD_MODE(ntpmsg.field) != NTP_MODE_SERVER) {
- log_debug("Unsupported mode %d. Disconnecting.", NTP_FIELD_MODE(ntpmsg.field));
- return manager_connect(m);
- }
-
- /* valid packet */
- m->pending = false;
- m->retry_interval = 0;
-
- /* announce leap seconds */
- if (NTP_FIELD_LEAP(ntpmsg.field) & NTP_LEAP_PLUSSEC)
- leap_sec = 1;
- else if (NTP_FIELD_LEAP(ntpmsg.field) & NTP_LEAP_MINUSSEC)
- leap_sec = -1;
- else
- leap_sec = 0;
-
- /*
- * "Timestamp Name ID When Generated
- * ------------------------------------------------------------
- * Originate Timestamp T1 time request sent by client
- * Receive Timestamp T2 time request received by server
- * Transmit Timestamp T3 time reply sent by server
- * Destination Timestamp T4 time reply received by client
- *
- * 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_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);
- dest = tv_to_d(recv_time) + OFFSET_1900_1970;
-
- offset = ((receive - origin) + (trans - dest)) / 2;
- delay = (dest - origin) - (trans - receive);
-
- spike = manager_sample_spike_detection(m, offset, delay);
-
- manager_adjust_poll(m, offset, spike);
-
- log_debug("NTP response:\n"
- " leap : %u\n"
- " version : %u\n"
- " mode : %u\n"
- " stratum : %u\n"
- " precision : %.6f sec (%d)\n"
- " reference : %.4s\n"
- " origin : %.3f\n"
- " receive : %.3f\n"
- " transmit : %.3f\n"
- " dest : %.3f\n"
- " offset : %+.3f sec\n"
- " delay : %+.3f sec\n"
- " packet count : %"PRIu64"\n"
- " jitter : %.3f%s\n"
- " poll interval: " USEC_FMT "\n",
- NTP_FIELD_LEAP(ntpmsg.field),
- NTP_FIELD_VERSION(ntpmsg.field),
- NTP_FIELD_MODE(ntpmsg.field),
- ntpmsg.stratum,
- exp2(ntpmsg.precision), ntpmsg.precision,
- ntpmsg.stratum == 1 ? ntpmsg.refid : "n/a",
- origin - OFFSET_1900_1970,
- receive - OFFSET_1900_1970,
- trans - OFFSET_1900_1970,
- dest - OFFSET_1900_1970,
- offset, delay,
- m->packet_count,
- m->samples_jitter, spike ? " spike" : "",
- 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 " 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)" : "");
-
- r = manager_arm_timer(m, m->poll_interval_usec);
- if (r < 0) {
- log_error("Failed to rearm timer: %s", strerror(-r));
- return r;
- }
-
- return 0;
-}
-
-static int manager_listen_setup(Manager *m) {
- union sockaddr_union addr = {};
- static const int tos = IPTOS_LOWDELAY;
- static const int on = 1;
- int r;
-
- assert(m);
-
- assert(m->server_socket < 0);
- assert(!m->event_receive);
- assert(m->current_server_address);
-
- addr.sa.sa_family = m->current_server_address->sockaddr.sa.sa_family;
-
- m->server_socket = socket(addr.sa.sa_family, SOCK_DGRAM | SOCK_CLOEXEC, 0);
- if (m->server_socket < 0)
- return -errno;
-
- r = bind(m->server_socket, &addr.sa, m->current_server_address->socklen);
- if (r < 0)
- return -errno;
-
- r = setsockopt(m->server_socket, SOL_SOCKET, SO_TIMESTAMP, &on, sizeof(on));
- if (r < 0)
- return -errno;
-
- setsockopt(m->server_socket, IPPROTO_IP, IP_TOS, &tos, sizeof(tos));
-
- return sd_event_add_io(m->event, &m->event_receive, m->server_socket, EPOLLIN, manager_receive_response, m);
-}
-
-static int manager_begin(Manager *m) {
- _cleanup_free_ char *pretty = NULL;
- int r;
-
- assert(m);
- assert_return(m->current_server_name, -EHOSTUNREACH);
- assert_return(m->current_server_address, -EHOSTUNREACH);
-
- m->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
-
- 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);
-
- r = manager_listen_setup(m);
- if (r < 0) {
- log_warning("Failed to setup connection socket: %s", strerror(-r));
- return r;
- }
-
- r = manager_clock_watch_setup(m);
- if (r < 0)
- return r;
-
- return manager_send_request(m);
-}
-
-static void server_name_flush_addresses(ServerName *n) {
- ServerAddress *a;
-
- assert(n);
-
- while ((a = n->addresses)) {
- LIST_REMOVE(addresses, n->addresses, a);
- free(a);
- }
-}
-
-static void manager_flush_names(Manager *m) {
- ServerName *n;
-
- assert(m);
-
- while ((n = m->servers)) {
- LIST_REMOVE(names, m->servers, n);
- free(n->string);
- server_name_flush_addresses(n);
- free(n);
- }
-}
-
-static int manager_resolve_handler(sd_resolve_query *q, int ret, const struct addrinfo *ai, void *userdata) {
- Manager *m = userdata;
- ServerAddress *a, *last = NULL;
-
- assert(q);
- assert(m);
- assert(m->current_server_name);
-
- m->resolve_query = sd_resolve_query_unref(m->resolve_query);
-
- if (ret != 0) {
- log_debug("Failed to resolve %s: %s", m->current_server_name->string, gai_strerror(ret));
-
- /* Try next host */
- return manager_connect(m);
- }
-
- server_name_flush_addresses(m->current_server_name);
-
- for (; ai; ai = ai->ai_next) {
- _cleanup_free_ char *pretty = NULL;
-
- assert(ai->ai_addr);
- assert(ai->ai_addrlen >= offsetof(struct sockaddr, sa_data));
- assert(ai->ai_addrlen <= sizeof(union sockaddr_union));
-
- if (!IN_SET(ai->ai_addr->sa_family, AF_INET, AF_INET6)) {
- log_warning("Unsuitable address protocol for %s", m->current_server_name->string);
- continue;
- }
-
- a = new0(ServerAddress, 1);
- if (!a)
- return log_oom();
-
- memcpy(&a->sockaddr, ai->ai_addr, ai->ai_addrlen);
- a->socklen = ai->ai_addrlen;
-
- LIST_INSERT_AFTER(addresses, m->current_server_name->addresses, last, a);
- last = a;
-
- sockaddr_pretty(&a->sockaddr.sa, a->socklen, true, &pretty);
- log_debug("Resolved address %s for %s.", pretty, m->current_server_name->string);
- }
-
- if (!m->current_server_name->addresses) {
- log_error("Failed to find suitable address for host %s.", m->current_server_name->string);
-
- /* Try next host */
- return manager_connect(m);
- }
-
- m->current_server_address = m->current_server_name->addresses;
-
- return manager_begin(m);
-}
-
-static int manager_retry(sd_event_source *source, usec_t usec, void *userdata) {
- Manager *m = userdata;
-
- assert(m);
-
- return manager_connect(m);
-}
-
-static int manager_connect(Manager *m) {
-
- struct addrinfo hints = {
- .ai_flags = AI_NUMERICSERV|AI_ADDRCONFIG,
- .ai_socktype = SOCK_DGRAM,
- };
- int r;
-
- assert(m);
-
- manager_disconnect(m);
-
- m->event_retry = sd_event_source_unref(m->event_retry);
- if (!ratelimit_test(&m->ratelimit)) {
- log_debug("Slowing down attempts to contact servers.");
-
- 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;
- }
-
- return 0;
- }
-
- /* If we already are operating on some address, switch to the
- * next one. */
- if (m->current_server_address && m->current_server_address->addresses_next)
- m->current_server_address = m->current_server_address->addresses_next;
- else {
- /* Hmm, we are through all addresses, let's look for the next host instead */
- m->current_server_address = NULL;
-
- if (m->current_server_name && m->current_server_name->names_next)
- m->current_server_name = m->current_server_name->names_next;
- else {
- if (!m->servers) {
- m->current_server_name = NULL;
- log_debug("No server found.");
- return 0;
- }
-
- m->current_server_name = m->servers;
- }
-
- /* Tell the resolver to reread /etc/resolv.conf, in
- * case it changed. */
- res_init();
-
- r = sd_resolve_getaddrinfo(m->resolve, &m->resolve_query, m->current_server_name->string, "123", &hints, manager_resolve_handler, m);
- if (r < 0) {
- log_error("Failed to create resolver: %s", strerror(-r));
- return r;
- }
-
- return 1;
- }
-
- r = manager_begin(m);
- if (r < 0)
- return r;
-
- return 1;
-}
-
-static int manager_add_server(Manager *m, const char *server) {
- ServerName *n, *tail;
-
- assert(m);
- assert(server);
-
- n = new0(ServerName, 1);
- if (!n)
- return -ENOMEM;
-
- n->string = strdup(server);
- if (!n->string) {
- free(n);
- return -ENOMEM;
- }
-
- LIST_FIND_TAIL(names, m->servers, tail);
- LIST_INSERT_AFTER(names, m->servers, tail, n);
-
- return 0;
-}
-
-static int manager_add_server_string(Manager *m, const char *string) {
- const char *word, *state;
- size_t l;
- int r;
-
- assert(m);
- assert(string);
-
- FOREACH_WORD_QUOTED(word, l, string, state) {
- char t[l+1];
-
- memcpy(t, word, l);
- t[l] = 0;
-
- r = manager_add_server(m, t);
- if (r < 0)
- log_error("Failed to add server %s to configuration, ignoring: %s", t, strerror(-r));
- }
- if (!isempty(state))
- log_warning("Trailing garbage at the end of server list, ignoring.");
-
- return 0;
-}
-
-static void manager_disconnect(Manager *m) {
- assert(m);
-
- m->resolve_query = sd_resolve_query_unref(m->resolve_query);
-
- m->event_timer = sd_event_source_unref(m->event_timer);
-
- m->event_receive = sd_event_source_unref(m->event_receive);
- m->server_socket = safe_close(m->server_socket);
-
- m->event_clock_watch = sd_event_source_unref(m->event_clock_watch);
- m->clock_watch_fd = safe_close(m->clock_watch_fd);
-
- m->event_timeout = sd_event_source_unref(m->event_timeout);
-
- sd_notifyf(false, "STATUS=Idle.");
-}
-
-static int manager_new(Manager **ret) {
- _cleanup_manager_free_ Manager *m = NULL;
- int r;
-
- assert(ret);
-
- m = new0(Manager, 1);
- if (!m)
- return -ENOMEM;
-
- m->server_socket = m->clock_watch_fd = -1;
-
- RATELIMIT_INIT(m->ratelimit, RATELIMIT_INTERVAL_USEC, RATELIMIT_BURST);
-
- r = sd_event_default(&m->event);
- if (r < 0)
- return r;
-
- 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 r;
-
- *ret = m;
- m = NULL;
-
- return 0;
-}
-
-static void manager_free(Manager *m) {
- if (!m)
- return;
-
- manager_disconnect(m);
- manager_flush_names(m);
-
- 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);
-
- free(m);
-}
-
-int config_parse_servers(
- const char *unit,
- const char *filename,
- unsigned line,
- const char *section,
- unsigned section_line,
- const char *lvalue,
- int ltype,
- const char *rvalue,
- void *data,
- void *userdata) {
-
- Manager *m = userdata;
-
- assert(filename);
- assert(lvalue);
- assert(rvalue);
-
- manager_flush_names(m);
- manager_add_server_string(m, rvalue);
-
- return 0;
-}
-
-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,
- false, false, true, m);
-}
-
-static bool network_is_online(void) {
- _cleanup_free_ char *state = NULL;
- int r;
-
- r = sd_network_get_operational_state(&state);
- 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) {
- 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 >= 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)
- r = manager_begin(m);
- else
- r = manager_connect(m);
- if (r < 0)
- return r;
- }
-
- return 0;
-}
-
-static int manager_network_monitor_listen(Manager *m) {
- int r, fd, events;
-
- assert(m);
-
- r = sd_network_monitor_new(&m->network_monitor, NULL);
- if (r < 0)
- return r;
-
- fd = sd_network_monitor_get_fd(m->network_monitor);
- if (fd < 0)
- return fd;
-
- events = sd_network_monitor_get_events(m->network_monitor);
- if (events < 0)
- return events;
-
- r = sd_event_add_io(m->event, &m->network_event_source, fd, events, manager_network_event_handler, m);
- if (r < 0)
- return r;
-
- return 0;
-}
-
int main(int argc, char *argv[]) {
- _cleanup_manager_free_ Manager *m = NULL;
+ _cleanup_(manager_freep) Manager *m = NULL;
const char *user = "systemd-timesync";
uid_t uid;
gid_t gid;
int r;
- if (argc > 1) {
- log_error("This program does not take arguments.");
- return EXIT_FAILURE;
- }
-
log_set_target(LOG_TARGET_AUTO);
log_set_facility(LOG_CRON);
log_parse_environment();
@@ -1188,26 +93,32 @@ int main(int argc, char *argv[]) {
umask(0022);
+ if (argc != 1) {
+ log_error("This program does not take arguments.");
+ r = -EINVAL;
+ goto finish;
+ }
+
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;
+ goto finish;
}
r = load_clock_timestamp(uid, gid);
if (r < 0)
- goto out;
+ goto finish;
r = drop_privileges(uid, gid, (1ULL << CAP_SYS_TIME));
if (r < 0)
- goto out;
+ goto finish;
assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
r = manager_new(&m);
if (r < 0) {
log_error("Failed to allocate manager: %s", strerror(-r));
- goto out;
+ goto finish;
}
if (clock_is_localtime() > 0) {
@@ -1216,14 +127,9 @@ int main(int argc, char *argv[]) {
m->rtc_local_time = true;
}
- 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;
- }
+ r = manager_parse_config_file(m);
+ if (r < 0)
+ log_warning("Failed to parse configuration file: %s", strerror(-r));
log_debug("systemd-timesyncd running as pid %lu", (unsigned long) getpid());
sd_notify(false, "READY=1");
@@ -1231,22 +137,22 @@ int main(int argc, char *argv[]) {
if (network_is_online()) {
r = manager_connect(m);
if (r < 0)
- goto out;
+ goto finish;
}
r = sd_event_loop(m->event);
if (r < 0) {
log_error("Failed to run event loop: %s", strerror(-r));
- goto out;
+ goto finish;
}
- 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_event_get_exit_code(m->event, &r);
+
+finish:
sd_notify(false, "STATUS=Shutting down...");
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
diff --git a/src/timesync/timesyncd.h b/src/timesync/timesyncd.h
deleted file mode 100644
index e723404..0000000
--- a/src/timesync/timesyncd.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
- This file is part of systemd.
-
- Copyright 2014 Kay Sievers, Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- systemd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include "list.h"
-#include "socket-util.h"
-#include "ratelimit.h"
-#include "sd-event.h"
-#include "sd-resolve.h"
-#include "sd-network.h"
-
-typedef struct Manager Manager;
-typedef struct ServerAddress ServerAddress;
-typedef struct ServerName ServerName;
-
-struct ServerAddress {
- union sockaddr_union sockaddr;
- socklen_t socklen;
- LIST_FIELDS(ServerAddress, addresses);
-};
-
-struct ServerName {
- char *string;
- LIST_HEAD(ServerAddress, addresses);
- LIST_FIELDS(ServerName, names);
-};
-
-static inline int server_address_pretty(ServerAddress *a, char **pretty) {
- return sockaddr_pretty(&a->sockaddr.sa, a->socklen, true, pretty);
-}
-
-struct Manager {
- sd_event *event;
- sd_resolve *resolve;
-
- LIST_HEAD(ServerName, servers);
-
- RateLimit ratelimit;
-
- /* network */
- sd_event_source *network_event_source;
- sd_network_monitor *network_monitor;
-
- /* peer */
- sd_resolve_query *resolve_query;
- sd_event_source *event_receive;
- ServerName *current_server_name;
- ServerAddress *current_server_address;
- int server_socket;
- uint64_t packet_count;
- sd_event_source *event_timeout;
-
- /* last sent packet */
- struct timespec trans_time_mon;
- struct timespec trans_time;
- usec_t retry_interval;
- bool pending;
-
- /* poll timer */
- sd_event_source *event_timer;
- usec_t poll_interval_usec;
- bool poll_resync;
-
- /* history data */
- struct {
- double offset;
- double delay;
- } samples[8];
- unsigned int samples_idx;
- double samples_jitter;
-
- /* last change */
- bool jumped;
- bool sync;
- int drift_ppm;
-
- /* watch for time changes */
- sd_event_source *event_clock_watch;
- int clock_watch_fd;
-
- /* Retry connections */
- sd_event_source *event_retry;
-
- /* RTC runs in local time, leave it alone */
- bool rtc_local_time;
-};
-
-const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length);
-
-int config_parse_servers(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
More information about the systemd-commits
mailing list