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

client: check address in waitsync command

Browse source
This commit is contained in:
Miroslav Lichvar 2016-09-06 15:24:31 +02:00
parent 23cf74d5c7
commit 41eb5b79cb
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
client.c
View file

@ -2507,6 +2507,7 @@ process_cmd_waitsync(char *line)
{ {
CMD_Request request; CMD_Request request;
CMD_Reply reply; CMD_Reply reply;
IPAddr ip_addr;
uint32_t ref_id; uint32_t ref_id;
double correction, skew_ppm, max_correction, max_skew_ppm, interval; double correction, skew_ppm, max_correction, max_skew_ppm, interval;
int ret = 0, max_tries, i; int ret = 0, max_tries, i;
@ -2528,6 +2529,7 @@ process_cmd_waitsync(char *line)
for (i = 1; ; i++) { for (i = 1; ; i++) {
if (request_reply(&request, &reply, RPY_TRACKING, 0)) { if (request_reply(&request, &reply, RPY_TRACKING, 0)) {
ref_id = ntohl(reply.data.tracking.ref_id); ref_id = ntohl(reply.data.tracking.ref_id);
UTI_IPNetworkToHost(&reply.data.tracking.ip_addr, &ip_addr);
correction = UTI_FloatNetworkToHost(reply.data.tracking.current_correction); correction = UTI_FloatNetworkToHost(reply.data.tracking.current_correction);
correction = fabs(correction); correction = fabs(correction);
@ -2536,7 +2538,8 @@ process_cmd_waitsync(char *line)
print_report("try: %d, refid: %R, correction: %.9f, skew: %.3f\n", print_report("try: %d, refid: %R, correction: %.9f, skew: %.3f\n",
i, (unsigned long)ref_id, correction, skew_ppm, REPORT_END); i, (unsigned long)ref_id, correction, skew_ppm, REPORT_END);
if (ref_id != 0 && ref_id != 0x7f7f0101L /* LOCAL refid */ && if ((ip_addr.family != IPADDR_UNSPEC ||
(ref_id != 0 && ref_id != 0x7f7f0101L /* LOCAL refid */)) &&
(max_correction == 0.0 || correction <= max_correction) && (max_correction == 0.0 || correction <= max_correction) &&
(max_skew_ppm == 0.0 || skew_ppm <= max_skew_ppm)) { (max_skew_ppm == 0.0 || skew_ppm <= max_skew_ppm)) {
ret = 1; ret = 1;