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

ntp: start resolving only from NSR_ResolveSources

Browse source 
Also, use macros to define the minimum and maximum resolving interval.
This commit is contained in:
Miroslav Lichvar 2014-04-28 15:37:29 +02:00
parent 6ee357d230
commit 9b137b2e37
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ntp_sources.c
View file

@ -74,6 +74,10 @@ struct UnresolvedSource {
struct UnresolvedSource *next; struct UnresolvedSource *next;
}; };
#define RESOLVE_INTERVAL_UNIT 7
#define MIN_RESOLVE_INTERVAL 2
#define MAX_RESOLVE_INTERVAL 9
static struct UnresolvedSource *unresolved_sources = NULL; static struct UnresolvedSource *unresolved_sources = NULL;
static int resolving_interval = 0; static int resolving_interval = 0;
static SCH_TimeoutID resolving_id; static SCH_TimeoutID resolving_id;
@ -273,9 +277,12 @@ name_resolve_handler(DNS_Status status, IPAddr *ip_addr, void *anything)
/* This was the last source in the list. If some sources couldn't /* This was the last source in the list. If some sources couldn't
be resolved, try again in exponentially increasing interval. */ be resolved, try again in exponentially increasing interval. */
if (unresolved_sources) { if (unresolved_sources) {
if (resolving_interval < 9) if (resolving_interval < MIN_RESOLVE_INTERVAL)
resolving_interval = MIN_RESOLVE_INTERVAL;
else if (resolving_interval < MAX_RESOLVE_INTERVAL)
resolving_interval++; resolving_interval++;
resolving_id = SCH_AddTimeoutByDelay(7 * (1 << resolving_interval), resolve_sources, NULL); resolving_id = SCH_AddTimeoutByDelay(RESOLVE_INTERVAL_UNIT *
(1 << resolving_interval), resolve_sources, NULL);
} else { } else {
resolving_interval = 0; resolving_interval = 0;
} }
@ -326,11 +333,6 @@ NSR_AddUnresolvedSource(char *name, int port, NTP_Source_Type type, SourceParame
for (i = &unresolved_sources; *i; i = &(*i)->next) for (i = &unresolved_sources; *i; i = &(*i)->next)
; ;
*i = us; *i = us;
if (!resolving_interval) {
resolving_interval = 2;
resolving_id = SCH_AddTimeoutByDelay(7 * (1 << resolving_interval), resolve_sources, NULL);
}
} }
/* ================================================== */ /* ================================================== */

2
ntp_sources.h
View file

@ -61,7 +61,7 @@ typedef void (*NSR_SourceResolvingEndHandler)(void);
/* Set the handler, or NULL to disable the notification */ /* Set the handler, or NULL to disable the notification */
extern void NSR_SetSourceResolvingEndHandler(NSR_SourceResolvingEndHandler handler); extern void NSR_SetSourceResolvingEndHandler(NSR_SourceResolvingEndHandler handler);
/* Procedure to start resolving unresolved sources immediately */ /* Procedure to start resolving unresolved sources */
extern void NSR_ResolveSources(void); extern void NSR_ResolveSources(void);
/* Procedure to start all sources */ /* Procedure to start all sources */