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

ntp: allow changing port of source

Browse source 
Modify the replace_source() function to not require a different IP
address when replacing a source with the same address but different
port. This will enable the NTS-KE port negotiation.
This commit is contained in:
Miroslav Lichvar 2020-02-13 13:27:23 +01:00
parent 5ed9b888ff
commit 9468fd4aa6
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ntp_sources.c
View file

@ -354,8 +354,10 @@ replace_source(NTP_Remote_Address *old_addr, NTP_Remote_Address *new_addr)
if (!found) if (!found)
return NSR_NoSuchSource; return NSR_NoSuchSource;
/* Make sure there is no other source using the new address (with the same
or different port), but allow a source to have its port changed */
find_slot(new_addr, &slot2, &found); find_slot(new_addr, &slot2, &found);
if (found) if (found == 2 || (found != 0 && slot1 != slot2))
return NSR_AlreadyInUse; return NSR_AlreadyInUse;
record = get_record(slot1); record = get_record(slot1);
@ -376,14 +378,18 @@ replace_source(NTP_Remote_Address *old_addr, NTP_Remote_Address *new_addr)
} }
name = record->name; name = record->name;
/* The hash table must be rebuilt for the new address */
rehash_records();
severity = UTI_IsIPReal(&old_addr->ip_addr) ? LOGS_INFO : LOGS_DEBUG; severity = UTI_IsIPReal(&old_addr->ip_addr) ? LOGS_INFO : LOGS_DEBUG;
if (slot1 != slot2) {
/* The hash table must be rebuilt for the changed address */
rehash_records();
LOG(severity, "Source %s replaced with %s (%s)", UTI_IPToString(&old_addr->ip_addr), LOG(severity, "Source %s replaced with %s (%s)", UTI_IPToString(&old_addr->ip_addr),
UTI_IPToString(&new_addr->ip_addr), name ? name : ""); UTI_IPToString(&new_addr->ip_addr), name ? name : "");
} else {
LOG(severity, "Source %s (%s) changed port to %d",
UTI_IPToString(&new_addr->ip_addr), name ? name : "", new_addr->port);
}
return NSR_Success; return NSR_Success;
} }