faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Save remote poll only with valid packets

Browse source
This commit is contained in:
Miroslav Lichvar 2013-06-04 15:35:22 +02:00
parent 78ae4ebfaa
commit 288043c13b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ntp_core.c
View file

@ -866,13 +866,12 @@ receive_packet(NTP_Packet *message, struct timeval *now, double now_err, NCR_Ins
} }
/* Regardless of any validity checks we apply, we are required to /* Regardless of any validity checks we apply, we are required to
save these two fields from the packet into the ntp source save this field from the packet into the ntp source
instance record. See RFC1305 section 3.4.4, peer.org <- pkt.xmt instance record. See RFC1305 section 3.4.4, peer.org <- pkt.xmt
& peer.peerpoll <- pkt.poll. Note we can't do this assignment & peer.peerpoll <- pkt.poll. Note we can't do this assignment
before test1 has been carried out!! */ before test1 has been carried out!! */
inst->remote_orig = message->transmit_ts; inst->remote_orig = message->transmit_ts;
inst->remote_poll = message->poll;
/* Test 3 requires that pkt.org != 0 and pkt.rec != 0. If /* Test 3 requires that pkt.org != 0 and pkt.rec != 0. If
either of these are true it means the association is not properly either of these are true it means the association is not properly
@ -1095,8 +1094,8 @@ receive_packet(NTP_Packet *message, struct timeval *now, double now_err, NCR_Ins
/* Reduce polling rate if KoD RATE was received */ /* Reduce polling rate if KoD RATE was received */
if (kod_rate && valid_kod) { if (kod_rate && valid_kod) {
if (inst->remote_poll > inst->minpoll) { if (message->poll > inst->minpoll) {
inst->minpoll = inst->remote_poll; inst->minpoll = message->poll;
if (inst->minpoll > inst->maxpoll) if (inst->minpoll > inst->maxpoll)
inst->maxpoll = inst->minpoll; inst->maxpoll = inst->minpoll;
if (inst->minpoll > inst->local_poll) if (inst->minpoll > inst->local_poll)
@ -1116,6 +1115,7 @@ receive_packet(NTP_Packet *message, struct timeval *now, double now_err, NCR_Ins
} }
if (valid_header && valid_data) { if (valid_header && valid_data) {
inst->remote_poll = message->poll;
inst->tx_count = 0; inst->tx_count = 0;
SRC_UpdateReachability(inst->source, 1); SRC_UpdateReachability(inst->source, 1);