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

ntp: don't send requests with unknown key

Browse source 
There is no point in sending a request if the configured key is missing.
A reply would be ignored anyway.
This commit is contained in:
Miroslav Lichvar 2014-03-20 18:29:44 +01:00
parent c14b81f3a9
commit a26058d425
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ntp_core.c
View file

@ -638,6 +638,11 @@ transmit_packet(NTP_Mode my_mode, /* The mode this machine wants to be */
message.auth_keyid = htonl(key_id); message.auth_keyid = htonl(key_id);
NIO_SendAuthenticatedPacket(&message, where_to, NIO_SendAuthenticatedPacket(&message, where_to,
sizeof (message.auth_keyid) + auth_len); sizeof (message.auth_keyid) + auth_len);
} else {
DEBUG_LOG(LOGF_NtpCore,
"Could not generate auth data with key %lu to send packet",
key_id);
return;
} }
} else { } else {
UTI_TimevalToInt64(&local_transmit, &message.transmit_ts, ts_fuzz); UTI_TimevalToInt64(&local_transmit, &message.transmit_ts, ts_fuzz);
@ -662,7 +667,6 @@ transmit_timeout(void *arg)
{ {
NCR_Instance inst = (NCR_Instance) arg; NCR_Instance inst = (NCR_Instance) arg;
double timeout_delay; double timeout_delay;
int do_auth;
inst->timer_running = 0; inst->timer_running = 0;
@ -730,15 +734,9 @@ transmit_timeout(void *arg)
} }
} }
if (inst->do_auth && KEY_KeyKnown(inst->auth_key_id)) {
do_auth = 1;
} else {
do_auth = 0;
}
transmit_packet(inst->mode, inst->local_poll, transmit_packet(inst->mode, inst->local_poll,
NTP_VERSION, NTP_VERSION,
do_auth, inst->auth_key_id, inst->do_auth, inst->auth_key_id,
&inst->remote_orig, &inst->remote_orig,
&inst->local_rx, &inst->local_tx, &inst->local_ntp_tx, &inst->local_rx, &inst->local_tx, &inst->local_ntp_tx,
&inst->remote_addr); &inst->remote_addr);