diff options
Diffstat (limited to 'client.c')
| -rw-r--r-- | client.c | 239 |
1 files changed, 162 insertions, 77 deletions
@@ -71,6 +71,8 @@ static int source_names = 0; static int csv_mode = 0; +static int end_dot = 0; + /* ================================================== */ /* Log a message. This is a minimalistic replacement of the logging.c implementation to avoid linking with it and other modules. */ @@ -870,6 +872,17 @@ process_cmd_doffset(CMD_Request *msg, char *line) /* ================================================== */ static int +convert_addsrc_sel_options(int options) +{ + return (options & SRC_SELECT_PREFER ? REQ_ADDSRC_PREFER : 0) | + (options & SRC_SELECT_NOSELECT ? REQ_ADDSRC_NOSELECT : 0) | + (options & SRC_SELECT_TRUST ? REQ_ADDSRC_TRUST : 0) | + (options & SRC_SELECT_REQUIRE ? REQ_ADDSRC_REQUIRE : 0); +} + +/* ================================================== */ + +static int process_cmd_add_source(CMD_Request *msg, char *line) { CPS_NTP_Source data; @@ -946,10 +959,7 @@ process_cmd_add_source(CMD_Request *msg, char *line) (data.params.nts ? REQ_ADDSRC_NTS : 0) | (data.params.copy ? REQ_ADDSRC_COPY : 0) | (data.params.ext_fields & NTP_EF_FLAG_EXP1 ? REQ_ADDSRC_EF_EXP1 : 0) | - (data.params.sel_options & SRC_SELECT_PREFER ? REQ_ADDSRC_PREFER : 0) | - (data.params.sel_options & SRC_SELECT_NOSELECT ? REQ_ADDSRC_NOSELECT : 0) | - (data.params.sel_options & SRC_SELECT_TRUST ? REQ_ADDSRC_TRUST : 0) | - (data.params.sel_options & SRC_SELECT_REQUIRE ? REQ_ADDSRC_REQUIRE : 0)); + convert_addsrc_sel_options(data.params.sel_options)); msg->data.ntp_source.filter_length = htonl(data.params.filter_length); msg->data.ntp_source.cert_set = htonl(data.params.cert_set); msg->data.ntp_source.max_delay_quant = @@ -1013,6 +1023,7 @@ give_help(void) "sources [-a] [-v]\0Display information about current sources\0" "sourcestats [-a] [-v]\0Display statistics about collected measurements\0" "selectdata [-a] [-v]\0Display information about source selection\0" + "selectopts <address|refid> <+|-options>\0Modify selection options\0" "reselect\0Force reselecting synchronisation source\0" "reselectdist <dist>\0Modify reselection distance\0" "\0\0" @@ -1127,8 +1138,8 @@ command_name_generator(const char *text, int state) "manual", "maxdelay", "maxdelaydevratio", "maxdelayratio", "maxpoll", "maxupdateskew", "minpoll", "minstratum", "ntpdata", "offline", "online", "onoffline", "polltarget", "quit", "refresh", "rekey", "reload", "reselect", "reselectdist", "reset", - "retries", "rtcdata", "selectdata", "serverstats", "settime", "shutdown", "smoothing", - "smoothtime", "sourcename", "sources", "sourcestats", + "retries", "rtcdata", "selectdata", "selectopts", "serverstats", "settime", + "shutdown", "smoothing", "smoothtime", "sourcename", "sources", "sourcestats", "timeout", "tracking", "trimrtc", "waitsync", "writertc", NULL }; @@ -1462,24 +1473,24 @@ request_reply(CMD_Request *request, CMD_Reply *reply, int requested_reply, int v /* ================================================== */ static void -print_seconds(unsigned long s) +print_seconds(uint32_t s) { - unsigned long d; + uint32_t d; if (s == (uint32_t)-1) { printf(" -"); } else if (s < 1200) { - printf("%4lu", s); + printf("%4"PRIu32, s); } else if (s < 36000) { - printf("%3lum", s / 60); + printf("%3"PRIu32"m", s / 60); } else if (s < 345600) { - printf("%3luh", s / 3600); + printf("%3"PRIu32"h", s / 3600); } else { d = s / 86400; if (d > 999) { - printf("%3luy", d / 365); + printf("%3"PRIu32"y", d / 365); } else { - printf("%3lud", d); + printf("%3"PRIu32"d", d); } } } @@ -1610,8 +1621,9 @@ print_report(const char *format, ...) va_list ap; int i, field, sign, width, prec, spec; const char *string; - unsigned long long_uinteger; unsigned int uinteger; + uint64_t uinteger64; + uint32_t uinteger32; int integer; struct timespec *ts; struct tm *tm; @@ -1709,9 +1721,9 @@ print_report(const char *format, ...) spec == 'O' ? "seconds" : "ppm", (dbl > 0.0) ^ (spec != 'O') ? "slow" : "fast"); break; - case 'I': /* interval with unit */ - long_uinteger = va_arg(ap, unsigned long); - print_seconds(long_uinteger); + case 'I': /* uint32_t interval with unit */ + uinteger32 = va_arg(ap, uint32_t); + print_seconds(uinteger32); break; case 'L': /* leap status */ integer = va_arg(ap, int); @@ -1778,8 +1790,8 @@ print_report(const char *format, ...) print_freq_ppm(dbl); break; case 'R': /* reference ID in hexdecimal */ - long_uinteger = va_arg(ap, unsigned long); - printf("%08lX", long_uinteger); + uinteger32 = va_arg(ap, uint32_t); + printf("%08"PRIX32, uinteger32); break; case 'S': /* offset with unit */ dbl = va_arg(ap, double); @@ -1796,14 +1808,18 @@ print_report(const char *format, ...) strftime(buf, sizeof (buf), "%a %b %d %T %Y", tm); printf("%s", buf); break; - case 'U': /* unsigned long in decimal */ - long_uinteger = va_arg(ap, unsigned long); - printf("%*lu", width, long_uinteger); + case 'U': /* uint32_t in decimal */ + uinteger32 = va_arg(ap, uint32_t); + printf("%*"PRIu32, width, uinteger32); break; case 'V': /* timespec as seconds since epoch */ ts = va_arg(ap, struct timespec *); printf("%s", UTI_TimespecToString(ts)); break; + case 'Q': /* uint64_t in decimal */ + uinteger64 = va_arg(ap, uint64_t); + printf("%*"PRIu64, width, uinteger64); + break; case 'b': /* unsigned int in binary */ uinteger = va_arg(ap, unsigned int); for (i = prec - 1; i >= 0; i--) @@ -2051,7 +2067,7 @@ process_cmd_sources(char *line) ntohs(reply.data.source_data.stratum), (int16_t)ntohs(reply.data.source_data.poll), ntohs(reply.data.source_data.reachability), - (unsigned long)ntohl(reply.data.source_data.since_sample), + ntohl(reply.data.source_data.since_sample), UTI_FloatNetworkToHost(reply.data.source_data.latest_meas), UTI_FloatNetworkToHost(reply.data.source_data.orig_latest_meas), UTI_FloatNetworkToHost(reply.data.source_data.latest_meas_err), @@ -2112,9 +2128,9 @@ process_cmd_sourcestats(char *line) print_report("%-25s %3U %3U %I %+P %P %+S %S\n", name, - (unsigned long)ntohl(reply.data.sourcestats.n_samples), - (unsigned long)ntohl(reply.data.sourcestats.n_runs), - (unsigned long)ntohl(reply.data.sourcestats.span_seconds), + ntohl(reply.data.sourcestats.n_samples), + ntohl(reply.data.sourcestats.n_runs), + ntohl(reply.data.sourcestats.span_seconds), UTI_FloatNetworkToHost(reply.data.sourcestats.resid_freq_ppm), UTI_FloatNetworkToHost(reply.data.sourcestats.skew_ppm), UTI_FloatNetworkToHost(reply.data.sourcestats.est_offset), @@ -2162,7 +2178,7 @@ process_cmd_tracking(char *line) "Root dispersion : %.9f seconds\n" "Update interval : %.1f seconds\n" "Leap status : %L\n", - (unsigned long)ref_id, name, + ref_id, name, ntohs(reply.data.tracking.stratum), &ref_time, UTI_FloatNetworkToHost(reply.data.tracking.current_correction), @@ -2250,10 +2266,10 @@ process_cmd_authdata(char *line) print_report("%-27s %4s %5U %4d %4d %I %4d %4d %4d %4d\n", name, mode_str, - (unsigned long)ntohl(reply.data.auth_data.key_id), + ntohl(reply.data.auth_data.key_id), ntohs(reply.data.auth_data.key_type), ntohs(reply.data.auth_data.key_length), - (unsigned long)ntohl(reply.data.auth_data.last_ke_ago), + ntohl(reply.data.auth_data.last_ke_ago), ntohs(reply.data.auth_data.ke_attempts), ntohs(reply.data.auth_data.nak), ntohs(reply.data.auth_data.cookies), @@ -2348,17 +2364,16 @@ process_cmd_ntpdata(char *line) "Total RX : %U\n" "Total valid RX : %U\n" "Total good RX : %U\n", - UTI_IPToString(&remote_addr), (unsigned long)UTI_IPToRefid(&remote_addr), + UTI_IPToString(&remote_addr), UTI_IPToRefid(&remote_addr), ntohs(reply.data.ntp_data.remote_port), - UTI_IPToString(&local_addr), (unsigned long)UTI_IPToRefid(&local_addr), + UTI_IPToString(&local_addr), UTI_IPToRefid(&local_addr), reply.data.ntp_data.leap, reply.data.ntp_data.version, reply.data.ntp_data.mode, reply.data.ntp_data.stratum, reply.data.ntp_data.poll, UTI_Log2ToDouble(reply.data.ntp_data.poll), reply.data.ntp_data.precision, UTI_Log2ToDouble(reply.data.ntp_data.precision), UTI_FloatNetworkToHost(reply.data.ntp_data.root_delay), UTI_FloatNetworkToHost(reply.data.ntp_data.root_dispersion), - (unsigned long)ntohl(reply.data.ntp_data.ref_id), - reply.data.ntp_data.stratum <= 1 ? + ntohl(reply.data.ntp_data.ref_id), reply.data.ntp_data.stratum <= 1 ? UTI_RefidToString(ntohl(reply.data.ntp_data.ref_id)) : "", &ref_time, UTI_FloatNetworkToHost(reply.data.ntp_data.offset), @@ -2372,10 +2387,10 @@ process_cmd_ntpdata(char *line) ntohs(reply.data.ntp_data.flags) & RPY_NTP_FLAG_INTERLEAVED, ntohs(reply.data.ntp_data.flags) & RPY_NTP_FLAG_AUTHENTICATED, reply.data.ntp_data.tx_tss_char, reply.data.ntp_data.rx_tss_char, - (unsigned long)ntohl(reply.data.ntp_data.total_tx_count), - (unsigned long)ntohl(reply.data.ntp_data.total_rx_count), - (unsigned long)ntohl(reply.data.ntp_data.total_valid_count), - (unsigned long)ntohl(reply.data.ntp_data.total_good_count), + ntohl(reply.data.ntp_data.total_tx_count), + ntohl(reply.data.ntp_data.total_rx_count), + ntohl(reply.data.ntp_data.total_valid_count), + ntohl(reply.data.ntp_data.total_good_count), REPORT_END); } @@ -2447,7 +2462,7 @@ process_cmd_selectdata(char *line) eff_options & RPY_SD_OPTION_TRUST ? 'T' : '-', eff_options & RPY_SD_OPTION_REQUIRE ? 'R' : '-', '-', - (unsigned long)ntohl(reply.data.select_data.last_sample_ago), + ntohl(reply.data.select_data.last_sample_ago), UTI_FloatNetworkToHost(reply.data.select_data.score), UTI_FloatNetworkToHost(reply.data.select_data.lo_limit), UTI_FloatNetworkToHost(reply.data.select_data.hi_limit), @@ -2467,31 +2482,43 @@ process_cmd_serverstats(char *line) CMD_Reply reply; request.command = htons(REQ_SERVER_STATS); - if (!request_reply(&request, &reply, RPY_SERVER_STATS3, 0)) + if (!request_reply(&request, &reply, RPY_SERVER_STATS4, 0)) return 0; - print_report("NTP packets received : %U\n" - "NTP packets dropped : %U\n" - "Command packets received : %U\n" - "Command packets dropped : %U\n" - "Client log records dropped : %U\n" - "NTS-KE connections accepted: %U\n" - "NTS-KE connections dropped : %U\n" - "Authenticated NTP packets : %U\n" - "Interleaved NTP packets : %U\n" - "NTP timestamps held : %U\n" - "NTP timestamp span : %U\n", - (unsigned long)ntohl(reply.data.server_stats.ntp_hits), - (unsigned long)ntohl(reply.data.server_stats.ntp_drops), - (unsigned long)ntohl(reply.data.server_stats.cmd_hits), - (unsigned long)ntohl(reply.data.server_stats.cmd_drops), - (unsigned long)ntohl(reply.data.server_stats.log_drops), - (unsigned long)ntohl(reply.data.server_stats.nke_hits), - (unsigned long)ntohl(reply.data.server_stats.nke_drops), - (unsigned long)ntohl(reply.data.server_stats.ntp_auth_hits), - (unsigned long)ntohl(reply.data.server_stats.ntp_interleaved_hits), - (unsigned long)ntohl(reply.data.server_stats.ntp_timestamps), - (unsigned long)ntohl(reply.data.server_stats.ntp_span_seconds), + print_report("NTP packets received : %Q\n" + "NTP packets dropped : %Q\n" + "Command packets received : %Q\n" + "Command packets dropped : %Q\n" + "Client log records dropped : %Q\n" + "NTS-KE connections accepted: %Q\n" + "NTS-KE connections dropped : %Q\n" + "Authenticated NTP packets : %Q\n" + "Interleaved NTP packets : %Q\n" + "NTP timestamps held : %Q\n" + "NTP timestamp span : %Q\n" + "NTP daemon RX timestamps : %Q\n" + "NTP daemon TX timestamps : %Q\n" + "NTP kernel RX timestamps : %Q\n" + "NTP kernel TX timestamps : %Q\n" + "NTP hardware RX timestamps : %Q\n" + "NTP hardware TX timestamps : %Q\n", + UTI_Integer64NetworkToHost(reply.data.server_stats.ntp_hits), + UTI_Integer64NetworkToHost(reply.data.server_stats.ntp_drops), + UTI_Integer64NetworkToHost(reply.data.server_stats.cmd_hits), + UTI_Integer64NetworkToHost(reply.data.server_stats.cmd_drops), + UTI_Integer64NetworkToHost(reply.data.server_stats.log_drops), + UTI_Integer64NetworkToHost(reply.data.server_stats.nke_hits), + UTI_Integer64NetworkToHost(reply.data.server_stats.nke_drops), + UTI_Integer64NetworkToHost(reply.data.server_stats.ntp_auth_hits), + UTI_Integer64NetworkToHost(reply.data.server_stats.ntp_interleaved_hits), + UTI_Integer64NetworkToHost(reply.data.server_stats.ntp_timestamps), + UTI_Integer64NetworkToHost(reply.data.server_stats.ntp_span_seconds), + UTI_Integer64NetworkToHost(reply.data.server_stats.ntp_daemon_rx_timestamps), + UTI_Integer64NetworkToHost(reply.data.server_stats.ntp_daemon_tx_timestamps), + UTI_Integer64NetworkToHost(reply.data.server_stats.ntp_kernel_rx_timestamps), + UTI_Integer64NetworkToHost(reply.data.server_stats.ntp_kernel_tx_timestamps), + UTI_Integer64NetworkToHost(reply.data.server_stats.ntp_hw_rx_timestamps), + UTI_Integer64NetworkToHost(reply.data.server_stats.ntp_hw_tx_timestamps), REPORT_END); return 1; @@ -2573,7 +2600,7 @@ process_cmd_rtcreport(char *line) &ref_time, ntohs(reply.data.rtc.n_samples), ntohs(reply.data.rtc.n_runs), - (unsigned long)ntohl(reply.data.rtc.span_seconds), + ntohl(reply.data.rtc.span_seconds), UTI_FloatNetworkToHost(reply.data.rtc.rtc_seconds_fast), UTI_FloatNetworkToHost(reply.data.rtc.rtc_gain_rate_ppm), REPORT_END); @@ -2648,16 +2675,15 @@ process_cmd_clients(char *line) print_report("%-25s %6U %5U %C %C %I %6U %5U %C %I\n", name, - (unsigned long)ntohl(client->ntp_hits), - (unsigned long)ntohl(client->ntp_drops), + ntohl(client->ntp_hits), + ntohl(client->ntp_drops), client->ntp_interval, client->ntp_timeout_interval, - (unsigned long)ntohl(client->last_ntp_hit_ago), - (unsigned long)ntohl(nke ? client->nke_hits : client->cmd_hits), - (unsigned long)ntohl(nke ? client->nke_drops : client->cmd_drops), + ntohl(client->last_ntp_hit_ago), + ntohl(nke ? client->nke_hits : client->cmd_hits), + ntohl(nke ? client->nke_drops : client->cmd_drops), nke ? client->nke_interval : client->cmd_interval, - (unsigned long)ntohl(nke ? client->last_nke_hit_ago : - client->last_cmd_hit_ago), + ntohl(nke ? client->last_nke_hit_ago : client->last_cmd_hit_ago), REPORT_END); } @@ -2688,7 +2714,7 @@ process_cmd_manual_list(const char *line) return 0; n_samples = ntohl(reply.data.manual_list.n_samples); - print_info_field("210 n_samples = %lu\n", (unsigned long)n_samples); + print_info_field("210 n_samples = %"PRIu32"\n", n_samples); print_header("# Date Time(UTC) Slewed Original Residual"); @@ -2808,11 +2834,11 @@ process_cmd_activity(const char *line) "%U sources doing burst (return to online)\n" "%U sources doing burst (return to offline)\n" "%U sources with unknown address\n", - (unsigned long)ntohl(reply.data.activity.online), - (unsigned long)ntohl(reply.data.activity.offline), - (unsigned long)ntohl(reply.data.activity.burst_online), - (unsigned long)ntohl(reply.data.activity.burst_offline), - (unsigned long)ntohl(reply.data.activity.unresolved), + ntohl(reply.data.activity.online), + ntohl(reply.data.activity.offline), + ntohl(reply.data.activity.burst_online), + ntohl(reply.data.activity.burst_offline), + ntohl(reply.data.activity.unresolved), REPORT_END); return 1; @@ -2892,6 +2918,55 @@ process_cmd_reset(CMD_Request *msg, char *line) /* ================================================== */ static int +process_cmd_selectopts(CMD_Request *msg, char *line) +{ + int mask, options, option; + uint32_t ref_id; + IPAddr ip_addr; + char *src, *opt; + + src = line; + line = CPS_SplitWord(line); + ref_id = 0; + + /* Don't allow hostnames to avoid conflicts with reference IDs */ + if (!UTI_StringToIdIP(src, &ip_addr) && !UTI_StringToIP(src, &ip_addr)) { + ip_addr.family = IPADDR_UNSPEC; + if (CPS_ParseRefid(src, &ref_id) == 0) { + LOG(LOGS_ERR, "Invalid syntax for selectopts command"); + return 0; + } + } + + mask = options = 0; + + while (*line != '\0') { + opt = line; + line = CPS_SplitWord(line); + + if ((opt[0] != '+' && opt[0] != '-') || (option = CPS_GetSelectOption(opt + 1)) == 0) { + LOG(LOGS_ERR, "Invalid syntax for selectopts command"); + return 0; + } + + mask |= option; + if (opt[0] == '+') + options |= option; + } + + UTI_IPHostToNetwork(&ip_addr, &msg->data.modify_select_opts.address); + msg->data.modify_select_opts.ref_id = htonl(ref_id); + msg->data.modify_select_opts.mask = htonl(mask); + msg->data.modify_select_opts.options = htonl(convert_addsrc_sel_options(options)); + + msg->command = htons(REQ_MODIFY_SELECTOPTS); + + return 1; +} + +/* ================================================== */ + +static int process_cmd_waitsync(char *line) { CMD_Request request; @@ -2926,7 +3001,7 @@ process_cmd_waitsync(char *line) skew_ppm = UTI_FloatNetworkToHost(reply.data.tracking.skew_ppm); print_report("try: %d, refid: %R, correction: %.9f, skew: %.3f\n", - i, (unsigned long)ref_id, correction, skew_ppm, REPORT_END); + i, ref_id, correction, skew_ppm, REPORT_END); if ((ip_addr.family != IPADDR_UNSPEC || (ref_id != 0 && ref_id != 0x7f7f0101L /* LOCAL refid */)) && @@ -3193,6 +3268,8 @@ process_line(char *line) } else if (!strcmp(command, "selectdata")) { do_normal_submit = 0; ret = process_cmd_selectdata(line); + } else if (!strcmp(command, "selectopts")) { + do_normal_submit = process_cmd_selectopts(&tx_message, line); } else if (!strcmp(command, "serverstats")) { do_normal_submit = 0; ret = process_cmd_serverstats(line); @@ -3243,6 +3320,10 @@ process_line(char *line) ret = request_reply(&tx_message, &rx_message, RPY_NULL, 1); } + if (end_dot) { + printf(".\n"); + } + fflush(stderr); if (fflush(stdout) != 0 || ferror(stdout) != 0) { @@ -3319,6 +3400,7 @@ print_help(const char *progname) " -n\t\tDon't resolve hostnames\n" " -N\t\tPrint original source names\n" " -c\t\tEnable CSV format\n" + " -e\t\tEnd responses with dot\n" #if DEBUG > 0 " -d\t\tEnable debug messages\n" #endif @@ -3363,7 +3445,7 @@ main(int argc, char **argv) optind = 1; /* Parse short command-line options */ - while ((opt = getopt(argc, argv, "+46acdf:h:mnNp:v")) != -1) { + while ((opt = getopt(argc, argv, "+46acdef:h:mnNp:v")) != -1) { switch (opt) { case '4': case '6': @@ -3381,6 +3463,9 @@ main(int argc, char **argv) log_min_severity = LOGS_DEBUG; #endif break; + case 'e': + end_dot = 1; + break; case 'h': hostnames = optarg; break; |