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

ntp: pass server name to ntp_core instances

Browse source 
The server name will be needed for certificate verification in NTS-KE.
This commit is contained in:
Miroslav Lichvar 2019-03-13 17:32:40 +01:00
parent ca83d2a804
commit fa402a173a
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ntp_core.c
View file

@ -504,7 +504,8 @@ take_offline(NCR_Instance inst)
/* ================================================== */ /* ================================================== */
NCR_Instance NCR_Instance
NCR_GetInstance(NTP_Remote_Address *remote_addr, NTP_Source_Type type, SourceParameters *params) NCR_CreateInstance(NTP_Remote_Address *remote_addr, NTP_Source_Type type,
SourceParameters *params, const char *name)
{ {
NCR_Instance result; NCR_Instance result;

3
ntp_core.h
View file

@ -59,7 +59,8 @@ extern void NCR_Initialise(void);
extern void NCR_Finalise(void); extern void NCR_Finalise(void);
/* Get a new instance for a server or peer */ /* Get a new instance for a server or peer */
extern NCR_Instance NCR_GetInstance(NTP_Remote_Address *remote_addr, NTP_Source_Type type, SourceParameters *params); extern NCR_Instance NCR_CreateInstance(NTP_Remote_Address *remote_addr, NTP_Source_Type type,
SourceParameters *params, const char *name);
/* Destroy an instance */ /* Destroy an instance */
extern void NCR_DestroyInstance(NCR_Instance instance); extern void NCR_DestroyInstance(NCR_Instance instance);

2
ntp_sources.c
View file

@ -320,7 +320,7 @@ add_source(NTP_Remote_Address *remote_addr, char *name, NTP_Source_Type type, So
assert(!found); assert(!found);
record = get_record(slot); record = get_record(slot);
record->data = NCR_GetInstance(remote_addr, type, params); record->data = NCR_CreateInstance(remote_addr, type, params, name);
record->remote_addr = NCR_GetRemoteAddress(record->data); record->remote_addr = NCR_GetRemoteAddress(record->data);
record->name = name ? Strdup(name) : NULL; record->name = name ? Strdup(name) : NULL;
record->pool = pool; record->pool = pool;

10
test/unit/ntp_core.c
View file

@ -345,7 +345,8 @@ test_unit(void)
TST_GetRandomAddress(&remote_addr.ip_addr, IPADDR_UNSPEC, -1); TST_GetRandomAddress(&remote_addr.ip_addr, IPADDR_UNSPEC, -1);
remote_addr.port = 123; remote_addr.port = 123;
inst1 = NCR_GetInstance(&remote_addr, random() % 2 ? NTP_SERVER : NTP_PEER, &source.params); inst1 = NCR_CreateInstance(&remote_addr, random() % 2 ? NTP_SERVER : NTP_PEER,
&source.params, NULL);
NCR_StartInstance(inst1); NCR_StartInstance(inst1);
has_updated = 0; has_updated = 0;
@ -400,7 +401,8 @@ test_unit(void)
NCR_DestroyInstance(inst1); NCR_DestroyInstance(inst1);
inst1 = NCR_GetInstance(&remote_addr, random() % 2 ? NTP_SERVER : NTP_PEER, &source.params); inst1 = NCR_CreateInstance(&remote_addr, random() % 2 ? NTP_SERVER : NTP_PEER,
&source.params, NULL);
NCR_StartInstance(inst1); NCR_StartInstance(inst1);
for (j = 0; j < 20; j++) { for (j = 0; j < 20; j++) {
@ -414,9 +416,9 @@ test_unit(void)
NCR_DestroyInstance(inst1); NCR_DestroyInstance(inst1);
inst1 = NCR_GetInstance(&remote_addr, NTP_PEER, &source.params); inst1 = NCR_CreateInstance(&remote_addr, NTP_PEER, &source.params, NULL);
NCR_StartInstance(inst1); NCR_StartInstance(inst1);
inst2 = NCR_GetInstance(&remote_addr, NTP_PEER, &source.params); inst2 = NCR_CreateInstance(&remote_addr, NTP_PEER, &source.params, NULL);
NCR_StartInstance(inst2); NCR_StartInstance(inst2);
res_length = req_length = 0; res_length = req_length = 0;