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

ntp: set minpoll from received KoD RATE at most to 10

Browse source 
Limit changing minpoll to a reasonable maximum in case the server is
broken or temporarily misconfigured.
This commit is contained in:
Miroslav Lichvar 2014-03-21 15:28:33 +01:00
parent 5afddad0d2
commit 7aa4bbf621
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ntp_core.c
View file

@ -210,6 +210,9 @@ struct NCR_Instance_Record {
/* Minimum allowed poll interval */ /* Minimum allowed poll interval */
#define MIN_POLL 0 #define MIN_POLL 0
/* Maximum poll interval set by KoD RATE */
#define MAX_KOD_RATE_POLL SRC_DEFAULT_MAXPOLL
/* ================================================== */ /* ================================================== */
static ADF_AuthTable access_auth_table; static ADF_AuthTable access_auth_table;
@ -1113,13 +1116,21 @@ 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 (message->poll > inst->minpoll) { if (message->poll > inst->minpoll) {
/* Set our minpoll to message poll, but use a reasonable maximum */
if (message->poll <= MAX_KOD_RATE_POLL)
inst->minpoll = message->poll; inst->minpoll = message->poll;
else if (inst->minpoll < MAX_KOD_RATE_POLL)
inst->minpoll = MAX_KOD_RATE_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)
inst->local_poll = inst->minpoll; inst->local_poll = inst->minpoll;
LOG(LOGS_WARN, LOGF_NtpCore, "Received KoD RATE from %s, minpoll set to %d",
UTI_IPToString(&inst->remote_addr.ip_addr), inst->minpoll); LOG(LOGS_WARN, LOGF_NtpCore,
"Received KoD RATE with poll %d from %s, minpoll set to %d",
message->poll, UTI_IPToString(&inst->remote_addr.ip_addr),
inst->minpoll);
} }
/* Stop ongoing burst */ /* Stop ongoing burst */