picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

timesync: add RootDistanceMaxSec= to timesyncd.conf (#7215) 

Closes #7211.
This commit is contained in:
Yu Watanabe 2017-11-05 15:39:34 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent 6e9834ea0f
commit f907cc1620
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
man/timesyncd.conf.xml
View File

@ -101,6 +101,12 @@
is used instead.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>RootDistanceMaxSec=</varname></term>
<listitem><para>Maximum acceptable root distance in seconds.
Defaults to 5 seconds.</para></listitem>
</varlistentry>
</variablelist>
</refsect1>

7
src/timesync/timesyncd-gperf.gperf
View File

@ -14,6 +14,7 @@ struct ConfigPerfItem;
%struct-type
%includes
%%
Time.NTP, config_parse_servers, SERVER_SYSTEM, 0
Time.Servers, config_parse_servers, SERVER_SYSTEM, 0
Time.FallbackNTP, config_parse_servers, SERVER_FALLBACK, 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
Time.RootDistanceMaxSec, config_parse_sec, 0, offsetof(Manager, max_root_distance_usec)

8
src/timesync/timesyncd-manager.c
View File

@ -80,8 +80,8 @@
#define NTP_FIELD_MODE(f) ((f) & 7)
#define NTP_FIELD(l, v, m) (((l) << 6) | ((v) << 3) | (m))
/* Maximum acceptable root distance in seconds. */
#define NTP_MAX_ROOT_DISTANCE 5.0
/* Maximum acceptable root distance in microseconds. */
#define NTP_MAX_ROOT_DISTANCE (5 * USEC_PER_SEC)
/* Maximum number of missed replies before selecting another source. */
#define NTP_MAX_MISSED_REPLIES 2
@ -588,7 +588,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
}
root_distance = ntp_ts_short_to_d(&ntpmsg.root_delay) / 2 + ntp_ts_short_to_d(&ntpmsg.root_dispersion);
if (root_distance > NTP_MAX_ROOT_DISTANCE) {
if (root_distance > (double) m->max_root_distance_usec / (double) USEC_PER_SEC) {
log_debug("Server has too large root distance. Disconnecting.");
return manager_connect(m);
}
@ -1124,6 +1124,8 @@ int manager_new(Manager **ret) {
if (!m)
return -ENOMEM;
m->max_root_distance_usec = NTP_MAX_ROOT_DISTANCE;
m->server_socket = m->clock_watch_fd = -1;
RATELIMIT_INIT(m->ratelimit, RATELIMIT_INTERVAL_USEC, RATELIMIT_BURST);

1
src/timesync/timesyncd-manager.h
View File

@ -76,6 +76,7 @@ struct Manager {
} samples[8];
unsigned int samples_idx;
double samples_jitter;
usec_t max_root_distance_usec;
/* last change */
bool jumped;

1
src/timesync/timesyncd.conf.in
View File

@ -14,3 +14,4 @@
[Time]
#NTP=
#FallbackNTP=@NTP_SERVERS@
#RootDistanceMaxSec=5