chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-dhcp: avoid checksum calculation if possible
[elogind.git]
/
src
/
timedate
/
timedate-sntp.c
diff --git
a/src/timedate/timedate-sntp.c
b/src/timedate/timedate-sntp.c
index e4aad36cc5499f42e410bbe0a59a227bf972f8c8..e47a0865673185143efb5f3fab4c8abfab7c29cc 100644
(file)
--- a/
src/timedate/timedate-sntp.c
+++ b/
src/timedate/timedate-sntp.c
@@
-205,7
+205,7
@@
static int sntp_send_request(SNTPContext *sntp) {
* matching answer to our request.
*
* The actual value does not matter, We do not care about the correct
* 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.
+ * NTP UINT_MAX fraction
;
we just pass the plain nanosecond value.
*/
clock_gettime(CLOCK_MONOTONIC, &sntp->trans_time_mon);
clock_gettime(CLOCK_REALTIME, &sntp->trans_time);
*/
clock_gettime(CLOCK_MONOTONIC, &sntp->trans_time_mon);
clock_gettime(CLOCK_REALTIME, &sntp->trans_time);
@@
-265,7
+265,12
@@
static int sntp_arm_timer(SNTPContext *sntp, usec_t next) {
}
e = sd_event_source_get_event(sntp->event_receive);
}
e = sd_event_source_get_event(sntp->event_receive);
- r = sd_event_add_monotonic(e, &sntp->event_timer, now(CLOCK_MONOTONIC) + next, 0, sntp_timer, sntp);
+ r = sd_event_add_time(
+ e,
+ &sntp->event_timer,
+ CLOCK_MONOTONIC,
+ now(CLOCK_MONOTONIC) + next, 0,
+ sntp_timer, sntp);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-288,7
+293,7
@@
static int sntp_clock_watch(sd_event_source *source, int fd, uint32_t revents, v
}
/* resync */
}
/* resync */
- log_info("System time changed
, r
esyncing.");
+ log_info("System time changed
. R
esyncing.");
sntp->poll_resync = true;
sntp_send_request(sntp);
sntp->poll_resync = true;
sntp_send_request(sntp);
@@
-442,7
+447,7
@@
static void sntp_adjust_poll(SNTPContext *sntp, double offset, bool spike) {
}
/* set to minimal poll interval */
}
/* set to minimal poll interval */
- if (fabs(offset) > NTP_ACCURACY_SEC) {
+ if (
!spike &&
fabs(offset) > NTP_ACCURACY_SEC) {
sntp->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
return;
}
sntp->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC;
return;
}
@@
-494,24
+499,24
@@
static int sntp_receive_response(sd_event_source *source, int fd, uint32_t reven
int r;
if (revents & (EPOLLHUP|EPOLLERR)) {
int r;
if (revents & (EPOLLHUP|EPOLLERR)) {
- log_debug("Server connection returned error
, c
losing.");
+ log_debug("Server connection returned error
. C
losing.");
sntp_server_disconnect(sntp);
return -ENOTCONN;
}
len = recvmsg(fd, &msghdr, MSG_DONTWAIT);
if (len < 0) {
sntp_server_disconnect(sntp);
return -ENOTCONN;
}
len = recvmsg(fd, &msghdr, MSG_DONTWAIT);
if (len < 0) {
- log_debug("Error receiving message
, disconnecting
");
+ log_debug("Error receiving message
. Disconnecting.
");
return -EINVAL;
}
if (iov.iov_len < sizeof(struct ntp_msg)) {
return -EINVAL;
}
if (iov.iov_len < sizeof(struct ntp_msg)) {
- log_debug("Invalid response from server
, disconnecting
");
+ log_debug("Invalid response from server
. Disconnecting.
");
return -EINVAL;
}
if (sntp->server_addr.sin_addr.s_addr != server_addr.sin_addr.s_addr) {
return -EINVAL;
}
if (sntp->server_addr.sin_addr.s_addr != server_addr.sin_addr.s_addr) {
- log_debug("Response from unknown server
, disconnecting
");
+ log_debug("Response from unknown server
. Disconnecting.
");
return -EINVAL;
}
return -EINVAL;
}
@@
-527,35
+532,35
@@
static int sntp_receive_response(sd_event_source *source, int fd, uint32_t reven
}
}
if (!recv_time) {
}
}
if (!recv_time) {
- log_debug("Invalid packet timestamp
, disconnecting
");
+ log_debug("Invalid packet timestamp
. Disconnecting.
");
return -EINVAL;
}
ntpmsg = iov.iov_base;
if (!sntp->pending) {
return -EINVAL;
}
ntpmsg = iov.iov_base;
if (!sntp->pending) {
- log_debug("Unexpected reply
, ignoring
");
+ log_debug("Unexpected reply
. Ignoring.
");
return 0;
}
/* check our "time cookie" (we just stored nanoseconds in the fraction field) */
return 0;
}
/* check our "time cookie" (we just stored nanoseconds in the fraction field) */
- if (be32toh(ntpmsg->origin_time.sec) != sntp->trans_time.tv_sec + OFFSET_1900_1970||
+ if (be32toh(ntpmsg->origin_time.sec) != sntp->trans_time.tv_sec + OFFSET_1900_1970
||
be32toh(ntpmsg->origin_time.frac) != sntp->trans_time.tv_nsec) {
be32toh(ntpmsg->origin_time.frac) != sntp->trans_time.tv_nsec) {
- log_debug("Invalid reply
, not our transmit time, ignoring
");
+ log_debug("Invalid reply
; not our transmit time. Ignoring.
");
return 0;
}
if (NTP_FIELD_LEAP(ntpmsg->field) == NTP_LEAP_NOTINSYNC) {
return 0;
}
if (NTP_FIELD_LEAP(ntpmsg->field) == NTP_LEAP_NOTINSYNC) {
- log_debug("Server is not synchronized
, disconnecting
");
+ log_debug("Server is not synchronized
. Disconnecting.
");
return -EINVAL;
}
if (NTP_FIELD_VERSION(ntpmsg->field) != 4) {
return -EINVAL;
}
if (NTP_FIELD_VERSION(ntpmsg->field) != 4) {
- log_debug("Response NTPv%d
, disconnecting
", NTP_FIELD_VERSION(ntpmsg->field));
+ log_debug("Response NTPv%d
. Disconnecting.
", NTP_FIELD_VERSION(ntpmsg->field));
return -EINVAL;
}
if (NTP_FIELD_MODE(ntpmsg->field) != NTP_MODE_SERVER) {
return -EINVAL;
}
if (NTP_FIELD_MODE(ntpmsg->field) != NTP_MODE_SERVER) {
- log_debug("Unsupported mode %d
, disconnecting
", NTP_FIELD_MODE(ntpmsg->field));
+ log_debug("Unsupported mode %d
. Disconnecting.
", NTP_FIELD_MODE(ntpmsg->field));
return -EINVAL;
}
return -EINVAL;
}
@@
-579,7
+584,7
@@
static int sntp_receive_response(sd_event_source *source, int fd, uint32_t reven
* Transmit Timestamp T3 time reply sent by server
* Destination Timestamp T4 time reply received by client
*
* 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:
+ * The round
-trip delay, d, and system clock offset, t,
are defined as:
* d = (T4 - T1) - (T3 - T2) t = ((T2 - T1) + (T3 - T4)) / 2"
*/
clock_gettime(CLOCK_MONOTONIC, &now_ts);
* d = (T4 - T1) - (T3 - T2) t = ((T2 - T1) + (T3 - T4)) / 2"
*/
clock_gettime(CLOCK_MONOTONIC, &now_ts);