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

ntp: set maximum allowed polling interval

Browse source 
To have an upper bound don't allow polling interval be larger than 24
(194 days).
This commit is contained in:
Miroslav Lichvar 2015-04-07 14:01:25 +02:00
parent 565976acbe
commit a79fbef21e
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ntp_core.c
View file

@ -217,8 +217,9 @@ static ARR_Instance broadcasts;
/* Invalid stratum number */ /* Invalid stratum number */
#define NTP_INVALID_STRATUM 0 #define NTP_INVALID_STRATUM 0
/* Minimum allowed poll interval */ /* Minimum and maximum allowed poll interval */
#define MIN_POLL 0 #define MIN_POLL 0
#define MAX_POLL 24
/* Kiss-o'-Death codes */ /* Kiss-o'-Death codes */
#define KOD_RATE 0x52415445UL /* RATE */ #define KOD_RATE 0x52415445UL /* RATE */
@ -445,9 +446,13 @@ NCR_GetInstance(NTP_Remote_Address *remote_addr, NTP_Source_Type type, SourcePar
result->minpoll = params->minpoll; result->minpoll = params->minpoll;
if (result->minpoll < MIN_POLL) if (result->minpoll < MIN_POLL)
result->minpoll = SRC_DEFAULT_MINPOLL; result->minpoll = SRC_DEFAULT_MINPOLL;
else if (result->minpoll > MAX_POLL)
result->minpoll = MAX_POLL;
result->maxpoll = params->maxpoll; result->maxpoll = params->maxpoll;
if (result->maxpoll < MIN_POLL) if (result->maxpoll < MIN_POLL)
result->maxpoll = SRC_DEFAULT_MAXPOLL; result->maxpoll = SRC_DEFAULT_MAXPOLL;
else if (result->maxpoll > MAX_POLL)
result->maxpoll = MAX_POLL;
if (result->maxpoll < result->minpoll) if (result->maxpoll < result->minpoll)
result->maxpoll = result->minpoll; result->maxpoll = result->minpoll;
@ -1734,7 +1739,7 @@ NCR_TakeSourceOffline(NCR_Instance inst)
void void
NCR_ModifyMinpoll(NCR_Instance inst, int new_minpoll) NCR_ModifyMinpoll(NCR_Instance inst, int new_minpoll)
{ {
if (new_minpoll < MIN_POLL) if (new_minpoll < MIN_POLL || new_minpoll > MAX_POLL)
return; return;
inst->minpoll = new_minpoll; inst->minpoll = new_minpoll;
LOG(LOGS_INFO, LOGF_NtpCore, "Source %s new minpoll %d", UTI_IPToString(&inst->remote_addr.ip_addr), new_minpoll); LOG(LOGS_INFO, LOGF_NtpCore, "Source %s new minpoll %d", UTI_IPToString(&inst->remote_addr.ip_addr), new_minpoll);
@ -1747,7 +1752,7 @@ NCR_ModifyMinpoll(NCR_Instance inst, int new_minpoll)
void void
NCR_ModifyMaxpoll(NCR_Instance inst, int new_maxpoll) NCR_ModifyMaxpoll(NCR_Instance inst, int new_maxpoll)
{ {
if (new_maxpoll < MIN_POLL) if (new_maxpoll < MIN_POLL || new_maxpoll > MAX_POLL)
return; return;
inst->maxpoll = new_maxpoll; inst->maxpoll = new_maxpoll;
LOG(LOGS_INFO, LOGF_NtpCore, "Source %s new maxpoll %d", UTI_IPToString(&inst->remote_addr.ip_addr), new_maxpoll); LOG(LOGS_INFO, LOGF_NtpCore, "Source %s new maxpoll %d", UTI_IPToString(&inst->remote_addr.ip_addr), new_maxpoll);