shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 18:55:09 +03:00
Code

timesyncd: remove retry_timer logic which is covered by the server timeout

Browse Source
This commit is contained in:
Kay Sievers 2014-09-02 14:27:00 +02:00
parent 63463bf091
commit 665c6a9eab
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,19 +206,6 @@ static int manager_send_request(Manager *m) {
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,
@ -601,7 +588,6 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
/* valid packet */
m->pending = false;
m->retry_interval = 0;
/* announce leap seconds */
if (NTP_FIELD_LEAP(ntpmsg.field) & NTP_LEAP_PLUSSEC)

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

@ -59,7 +59,6 @@ struct Manager {
/* last sent packet */
struct timespec trans_time_mon;
struct timespec trans_time;
usec_t retry_interval;
bool pending;
/* poll timer */