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

ntp: update number of sources when removing all sources

Browse source 
Also, rehash the records after removal and split cleaning of the source
record to a separate function.
This commit is contained in:
Miroslav Lichvar 2014-11-24 18:28:39 +01:00
parent aaf744dfab
commit f2c80cae44
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ntp_sources.c
View file

@ -571,6 +571,18 @@ void NSR_AutoStartSources(void)
/* ================================================== */ /* ================================================== */
static void
clean_source_record(SourceRecord *record)
{
assert(record->remote_addr);
record->remote_addr = NULL;
NCR_DestroyInstance(record->data);
n_sources--;
}
/* ================================================== */
/* Procedure to remove a source. We don't bother whether the port /* Procedure to remove a source. We don't bother whether the port
address is matched - we're only interested in removing a record for address is matched - we're only interested in removing a record for
the right IP address. Thus the caller can specify the port number the right IP address. Thus the caller can specify the port number
@ -587,9 +599,7 @@ NSR_RemoveSource(NTP_Remote_Address *remote_addr)
return NSR_NoSuchSource; return NSR_NoSuchSource;
} }
n_sources--; clean_source_record(get_record(slot));
get_record(slot)->remote_addr = NULL;
NCR_DestroyInstance(get_record(slot)->data);
/* Rehash the table to make sure there are no broken probe sequences. /* Rehash the table to make sure there are no broken probe sequences.
This is costly, but it's not expected to happen frequently. */ This is costly, but it's not expected to happen frequently. */
@ -611,9 +621,10 @@ NSR_RemoveAllSources(void)
record = get_record(i); record = get_record(i);
if (!record->remote_addr) if (!record->remote_addr)
continue; continue;
NCR_DestroyInstance(record->data); clean_source_record(record);
record->remote_addr = NULL;
} }
rehash_records();
} }
/* ================================================== */ /* ================================================== */