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

ntp: close client socket when offline

Browse source
This commit is contained in:
Miroslav Lichvar 2014-04-10 17:59:08 +02:00
parent 3217421797
commit 08faca03b7
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ntp_core.c
View file

@ -263,6 +263,10 @@ start_initial_timeout(NCR_Instance inst)
/* Mark source active */ /* Mark source active */
SRC_SetActive(inst->source); SRC_SetActive(inst->source);
/* Open client socket */
if (inst->mode == MODE_CLIENT)
inst->local_addr.sock_fd = NIO_GetClientSocket(&inst->remote_addr);
} }
/* ================================================== */ /* ================================================== */
@ -281,6 +285,10 @@ take_offline(NCR_Instance inst)
/* And inactive */ /* And inactive */
SRC_UnsetActive(inst->source); SRC_UnsetActive(inst->source);
/* Close client socket */
if (inst->mode == MODE_CLIENT)
NIO_CloseClientSocket(inst->local_addr.sock_fd);
} }
/* ================================================== */ /* ================================================== */
@ -297,7 +305,7 @@ NCR_GetInstance(NTP_Remote_Address *remote_addr, NTP_Source_Type type, SourcePar
switch (type) { switch (type) {
case NTP_SERVER: case NTP_SERVER:
result->local_addr.sock_fd = NIO_GetClientSocket(remote_addr); /* Client socket will be obtained when timer is started */
result->mode = MODE_CLIENT; result->mode = MODE_CLIENT;
break; break;
case NTP_PEER: case NTP_PEER:
@ -384,20 +392,14 @@ NCR_GetInstance(NTP_Remote_Address *remote_addr, NTP_Source_Type type, SourcePar
void void
NCR_DestroyInstance(NCR_Instance instance) NCR_DestroyInstance(NCR_Instance instance)
{ {
if (instance->opmode != MD_OFFLINE)
take_offline(instance);
/* This will destroy the source instance inside the /* This will destroy the source instance inside the
structure, which will cause reselection if this was the structure, which will cause reselection if this was the
synchronising source etc. */ synchronising source etc. */
SRC_DestroyInstance(instance->source); SRC_DestroyInstance(instance->source);
/* Cancel any pending timeouts */
if (instance->timer_running) {
SCH_RemoveTimeout(instance->timeout_id);
instance->timer_running = 0;
}
if (instance->mode == MODE_CLIENT)
NIO_CloseClientSocket(instance->local_addr.sock_fd);
/* Free the data structure */ /* Free the data structure */
Free(instance); Free(instance);
} }