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

client: rework error printing for unsupported source options

Browse source
This commit is contained in:
Miroslav Lichvar 2016-06-28 13:26:09 +02:00
parent 223ad0e8aa
commit 632cd1a177
1 changed files with 19 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
client.c
View file

@ -1060,6 +1060,7 @@ process_cmd_add_server_or_peer(CMD_Request *msg, char *line)
CPS_NTP_Source data; CPS_NTP_Source data;
IPAddr ip_addr; IPAddr ip_addr;
int result = 0, status; int result = 0, status;
const char *opt_name;
status = CPS_ParseNTPSourceAdd(line, &data); status = CPS_ParseNTPSourceAdd(line, &data);
switch (status) { switch (status) {
@ -1072,38 +1073,25 @@ process_cmd_add_server_or_peer(CMD_Request *msg, char *line)
break; break;
} }
if (data.params.min_stratum != SRC_DEFAULT_MINSTRATUM) { if (data.params.max_delay_dev_ratio != SRC_DEFAULT_MAXDELAYDEVRATIO)
LOG(LOGS_WARN, LOGF_Client, "Option minstratum not supported"); opt_name = "maxdelaydevratio";
break; else if (data.params.max_samples != SRC_DEFAULT_MAXSAMPLES)
} opt_name = "maxsamples";
else if (data.params.min_samples != SRC_DEFAULT_MINSAMPLES)
opt_name = "minsamples";
else if (data.params.max_sources != SRC_DEFAULT_MAXSOURCES)
opt_name = "maxsources";
else if (data.params.min_stratum != SRC_DEFAULT_MINSTRATUM)
opt_name = "minstratum";
else if (data.params.poll_target != SRC_DEFAULT_POLLTARGET)
opt_name = "polltarget";
else if (data.params.version != NTP_VERSION)
opt_name = "version";
else
opt_name = NULL;
if (data.params.poll_target != SRC_DEFAULT_POLLTARGET) { if (opt_name) {
LOG(LOGS_WARN, LOGF_Client, "Option polltarget not supported"); LOG(LOGS_ERR, LOGF_Client, "%s can't be set in chronyc", opt_name);
break;
}
if (data.params.max_delay_dev_ratio != SRC_DEFAULT_MAXDELAYDEVRATIO) {
LOG(LOGS_WARN, LOGF_Client, "Option maxdelaydevratio not supported");
break;
}
if (data.params.version != NTP_VERSION) {
LOG(LOGS_WARN, LOGF_Client, "Option version not supported");
break;
}
if (data.params.max_sources != SRC_DEFAULT_MAXSOURCES) {
LOG(LOGS_WARN, LOGF_Client, "Option maxsources not supported");
break;
}
if (data.params.min_samples != SRC_DEFAULT_MINSAMPLES) {
LOG(LOGS_WARN, LOGF_Client, "Option minsamples not supported");
break;
}
if (data.params.max_samples != SRC_DEFAULT_MAXSAMPLES) {
LOG(LOGS_WARN, LOGF_Client, "Option maxsamples not supported");
break; break;
} }