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

ntp: make use of NCR_ProcessUnknown in NCR_ProcessKnown

Browse source 
After recent changes the code in NCR_ProcessKnown is now identical and
can be replaced with NCR_ProcessUnknown call.
This commit is contained in:
Miroslav Lichvar 2014-03-20 19:14:47 +01:00
parent f9e2213afd
commit 8d02e5f680
1 changed files with 2 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
ntp_core.c
View file

@ -1251,10 +1251,7 @@ NCR_ProcessKnown
{ {
int pkt_mode; int pkt_mode;
int version; int version;
int valid_auth; int auth_len;
int authenticate_reply, auth_len;
unsigned long auth_key_id;
unsigned long reply_auth_key_id;
/* Ignore packets from offline sources */ /* Ignore packets from offline sources */
if (inst->opmode == MD_OFFLINE) { if (inst->opmode == MD_OFFLINE) {
@ -1296,45 +1293,7 @@ NCR_ProcessKnown
one of the secondaries to flywheel it. The behaviour coded here one of the secondaries to flywheel it. The behaviour coded here
is required in the secondaries to make this possible. */ is required in the secondaries to make this possible. */
if (ADF_IsAllowed(access_auth_table, &inst->remote_addr.ip_addr)) { NCR_ProcessUnknown(message, now, now_err, &inst->remote_addr, length);
int do_auth;
CLG_LogNTPClientAccess(&inst->remote_addr.ip_addr, (time_t) now->tv_sec);
if (auth_len > 0) {
do_auth = 1;
auth_key_id = ntohl(message->auth_keyid);
valid_auth = check_packet_auth(message, auth_key_id, auth_len);
if (valid_auth) {
authenticate_reply = 1;
reply_auth_key_id = auth_key_id;
} else {
authenticate_reply = 0;
reply_auth_key_id = 0UL;
}
} else {
do_auth = 0;
authenticate_reply = 0;
reply_auth_key_id = 0UL;
}
if (!do_auth || valid_auth) {
transmit_packet(MODE_SERVER, inst->local_poll,
version,
authenticate_reply, reply_auth_key_id,
&message->transmit_ts,
now,
NULL,
NULL,
&inst->remote_addr);
}
} else if (!LOG_RateLimited()) {
LOG(LOGS_WARN, LOGF_NtpCore, "NTP packet received from unauthorised host %s port %d",
UTI_IPToString(&inst->remote_addr.ip_addr),
inst->remote_addr.port);
}
break; break;