diff options
| author | glebius <glebius@FreeBSD.org> | 2015-10-26 11:37:31 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2015-10-26 11:37:31 +0000 |
| commit | 81511473d32294dc562d10f7b3e97630ccf0b64f (patch) | |
| tree | 83f2b5fa5bca87e28ea638c9459aebb211698059 /contrib/ntp/ntpd/ntp_control.c | |
| parent | a5a01b895b5c5a5a2f92fb611161c7c0f840a76a (diff) | |
| download | FreeBSD-src-81511473d32294dc562d10f7b3e97630ccf0b64f.zip FreeBSD-src-81511473d32294dc562d10f7b3e97630ccf0b64f.tar.gz | |
Upgrade NTP to 4.2.8p4.
Security: FreeBSD-SA-15:25.ntp
Security: CVE-2015-7871
Security: CVE-2015-7855
Security: CVE-2015-7854
Security: CVE-2015-7853
Security: CVE-2015-7852
Security: CVE-2015-7851
Security: CVE-2015-7850
Security: CVE-2015-7849
Security: CVE-2015-7848
Security: CVE-2015-7701
Security: CVE-2015-7703
Security: CVE-2015-7704, CVE-2015-7705
Security: CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
Approved by: so
Diffstat (limited to 'contrib/ntp/ntpd/ntp_control.c')
| -rw-r--r-- | contrib/ntp/ntpd/ntp_control.c | 4430 |
1 files changed, 3231 insertions, 1199 deletions
diff --git a/contrib/ntp/ntpd/ntp_control.c b/contrib/ntp/ntpd/ntp_control.c index dbee89a..7736311 100644 --- a/contrib/ntp/ntpd/ntp_control.c +++ b/contrib/ntp/ntpd/ntp_control.c @@ -1,14 +1,20 @@ /* - * ntp_control.c - respond to control messages and send async traps - */ - -/* - * $FreeBSD$ + * ntp_control.c - respond to mode 6 control messages and send async + * traps. Provides service to ntpq and others. */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> +#endif + +#include <stdio.h> +#include <ctype.h> +#include <signal.h> +#include <sys/stat.h> +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> #endif +#include <arpa/inet.h> #include "ntpd.h" #include "ntp_io.h" @@ -16,138 +22,428 @@ #include "ntp_control.h" #include "ntp_unixtime.h" #include "ntp_stdlib.h" - -#include <stdio.h> -#include <ctype.h> -#include <signal.h> - -#include <netinet/in.h> -#include <arpa/inet.h> - -#ifndef MIN -#define MIN(a, b) (((a) <= (b)) ? (a) : (b)) +#include "ntp_config.h" +#include "ntp_crypto.h" +#include "ntp_assert.h" +#include "ntp_leapsec.h" +#include "ntp_md5.h" /* provides OpenSSL digest API */ +#include "lib_strbuf.h" +#include <rc_cmdlength.h> +#ifdef KERNEL_PLL +# include "ntp_syscall.h" #endif + /* * Structure to hold request procedure information */ -#define NOAUTH 0 -#define AUTH 1 - -#define NO_REQUEST (-1) struct ctl_proc { short control_code; /* defined request code */ +#define NO_REQUEST (-1) u_short flags; /* flags word */ - void (*handler) P((struct recvbuf *, int)); /* handle request */ -}; - -/* - * Only one flag. Authentication required or not. - */ + /* Only one flag. Authentication required or not. */ #define NOAUTH 0 #define AUTH 1 + void (*handler) (struct recvbuf *, int); /* handle request */ +}; + /* * Request processing routines */ -static void ctl_error P((int)); +static void ctl_error (u_char); #ifdef REFCLOCK -static u_short ctlclkstatus P((struct refclockstat *)); -#endif -static void ctl_flushpkt P((int)); -static void ctl_putdata P((const char *, unsigned int, int)); -static void ctl_putstr P((const char *, const char *, - unsigned int)); -static void ctl_putdbl P((const char *, double)); -static void ctl_putuint P((const char *, u_long)); -static void ctl_puthex P((const char *, u_long)); -static void ctl_putint P((const char *, long)); -static void ctl_putts P((const char *, l_fp *)); -static void ctl_putadr P((const char *, u_int32, struct sockaddr_storage*)); -static void ctl_putid P((const char *, char *)); -static void ctl_putarray P((const char *, double *, int)); -static void ctl_putsys P((int)); -static void ctl_putpeer P((int, struct peer *)); -#ifdef OPENSSL -static void ctl_putfs P((const char *, tstamp_t)); +static u_short ctlclkstatus (struct refclockstat *); #endif +static void ctl_flushpkt (u_char); +static void ctl_putdata (const char *, unsigned int, int); +static void ctl_putstr (const char *, const char *, size_t); +static void ctl_putdblf (const char *, int, int, double); +#define ctl_putdbl(tag, d) ctl_putdblf(tag, 1, 3, d) +#define ctl_putdbl6(tag, d) ctl_putdblf(tag, 1, 6, d) +#define ctl_putsfp(tag, sfp) ctl_putdblf(tag, 0, -1, \ + FPTOD(sfp)) +static void ctl_putuint (const char *, u_long); +static void ctl_puthex (const char *, u_long); +static void ctl_putint (const char *, long); +static void ctl_putts (const char *, l_fp *); +static void ctl_putadr (const char *, u_int32, + sockaddr_u *); +static void ctl_putrefid (const char *, u_int32); +static void ctl_putarray (const char *, double *, int); +static void ctl_putsys (int); +static void ctl_putpeer (int, struct peer *); +static void ctl_putfs (const char *, tstamp_t); #ifdef REFCLOCK -static void ctl_putclock P((int, struct refclockstat *, int)); +static void ctl_putclock (int, struct refclockstat *, int); #endif /* REFCLOCK */ -static struct ctl_var *ctl_getitem P((struct ctl_var *, char **)); -static u_long count_var P((struct ctl_var *)); -static void control_unspec P((struct recvbuf *, int)); -static void read_status P((struct recvbuf *, int)); -static void read_variables P((struct recvbuf *, int)); -static void write_variables P((struct recvbuf *, int)); -static void read_clock_status P((struct recvbuf *, int)); -static void write_clock_status P((struct recvbuf *, int)); -static void set_trap P((struct recvbuf *, int)); -static void unset_trap P((struct recvbuf *, int)); -static struct ctl_trap *ctlfindtrap P((struct sockaddr_storage *, - struct interface *)); - -static struct ctl_proc control_codes[] = { - { CTL_OP_UNSPEC, NOAUTH, control_unspec }, - { CTL_OP_READSTAT, NOAUTH, read_status }, - { CTL_OP_READVAR, NOAUTH, read_variables }, - { CTL_OP_WRITEVAR, AUTH, write_variables }, - { CTL_OP_READCLOCK, NOAUTH, read_clock_status }, - { CTL_OP_WRITECLOCK, NOAUTH, write_clock_status }, - { CTL_OP_SETTRAP, NOAUTH, set_trap }, - { CTL_OP_UNSETTRAP, NOAUTH, unset_trap }, - { NO_REQUEST, 0 } +static const struct ctl_var *ctl_getitem(const struct ctl_var *, + char **); +static u_short count_var (const struct ctl_var *); +static void control_unspec (struct recvbuf *, int); +static void read_status (struct recvbuf *, int); +static void read_sysvars (void); +static void read_peervars (void); +static void read_variables (struct recvbuf *, int); +static void write_variables (struct recvbuf *, int); +static void read_clockstatus(struct recvbuf *, int); +static void write_clockstatus(struct recvbuf *, int); +static void set_trap (struct recvbuf *, int); +static void save_config (struct recvbuf *, int); +static void configure (struct recvbuf *, int); +static void send_mru_entry (mon_entry *, int); +static void send_random_tag_value(int); +static void read_mru_list (struct recvbuf *, int); +static void send_ifstats_entry(endpt *, u_int); +static void read_ifstats (struct recvbuf *); +static void sockaddrs_from_restrict_u(sockaddr_u *, sockaddr_u *, + restrict_u *, int); +static void send_restrict_entry(restrict_u *, int, u_int); +static void send_restrict_list(restrict_u *, int, u_int *); +static void read_addr_restrictions(struct recvbuf *); +static void read_ordlist (struct recvbuf *, int); +static u_int32 derive_nonce (sockaddr_u *, u_int32, u_int32); +static void generate_nonce (struct recvbuf *, char *, size_t); +static int validate_nonce (const char *, struct recvbuf *); +static void req_nonce (struct recvbuf *, int); +static void unset_trap (struct recvbuf *, int); +static struct ctl_trap *ctlfindtrap(sockaddr_u *, + struct interface *); + +static const struct ctl_proc control_codes[] = { + { CTL_OP_UNSPEC, NOAUTH, control_unspec }, + { CTL_OP_READSTAT, NOAUTH, read_status }, + { CTL_OP_READVAR, NOAUTH, read_variables }, + { CTL_OP_WRITEVAR, AUTH, write_variables }, + { CTL_OP_READCLOCK, NOAUTH, read_clockstatus }, + { CTL_OP_WRITECLOCK, NOAUTH, write_clockstatus }, + { CTL_OP_SETTRAP, NOAUTH, set_trap }, + { CTL_OP_CONFIGURE, AUTH, configure }, + { CTL_OP_SAVECONFIG, AUTH, save_config }, + { CTL_OP_READ_MRU, NOAUTH, read_mru_list }, + { CTL_OP_READ_ORDLIST_A, AUTH, read_ordlist }, + { CTL_OP_REQ_NONCE, NOAUTH, req_nonce }, + { CTL_OP_UNSETTRAP, NOAUTH, unset_trap }, + { NO_REQUEST, 0, NULL } }; /* + * System variables we understand + */ +#define CS_LEAP 1 +#define CS_STRATUM 2 +#define CS_PRECISION 3 +#define CS_ROOTDELAY 4 +#define CS_ROOTDISPERSION 5 +#define CS_REFID 6 +#define CS_REFTIME 7 +#define CS_POLL 8 +#define CS_PEERID 9 +#define CS_OFFSET 10 +#define CS_DRIFT 11 +#define CS_JITTER 12 +#define CS_ERROR 13 +#define CS_CLOCK 14 +#define CS_PROCESSOR 15 +#define CS_SYSTEM 16 +#define CS_VERSION 17 +#define CS_STABIL 18 +#define CS_VARLIST 19 +#define CS_TAI 20 +#define CS_LEAPTAB 21 +#define CS_LEAPEND 22 +#define CS_RATE 23 +#define CS_MRU_ENABLED 24 +#define CS_MRU_DEPTH 25 +#define CS_MRU_DEEPEST 26 +#define CS_MRU_MINDEPTH 27 +#define CS_MRU_MAXAGE 28 +#define CS_MRU_MAXDEPTH 29 +#define CS_MRU_MEM 30 +#define CS_MRU_MAXMEM 31 +#define CS_SS_UPTIME 32 +#define CS_SS_RESET 33 +#define CS_SS_RECEIVED 34 +#define CS_SS_THISVER 35 +#define CS_SS_OLDVER 36 +#define CS_SS_BADFORMAT 37 +#define CS_SS_BADAUTH 38 +#define CS_SS_DECLINED 39 +#define CS_SS_RESTRICTED 40 +#define CS_SS_LIMITED 41 +#define CS_SS_KODSENT 42 +#define CS_SS_PROCESSED 43 +#define CS_PEERADR 44 +#define CS_PEERMODE 45 +#define CS_BCASTDELAY 46 +#define CS_AUTHDELAY 47 +#define CS_AUTHKEYS 48 +#define CS_AUTHFREEK 49 +#define CS_AUTHKLOOKUPS 50 +#define CS_AUTHKNOTFOUND 51 +#define CS_AUTHKUNCACHED 52 +#define CS_AUTHKEXPIRED 53 +#define CS_AUTHENCRYPTS 54 +#define CS_AUTHDECRYPTS 55 +#define CS_AUTHRESET 56 +#define CS_K_OFFSET 57 +#define CS_K_FREQ 58 +#define CS_K_MAXERR 59 +#define CS_K_ESTERR 60 +#define CS_K_STFLAGS 61 +#define CS_K_TIMECONST 62 +#define CS_K_PRECISION 63 +#define CS_K_FREQTOL 64 +#define CS_K_PPS_FREQ 65 +#define CS_K_PPS_STABIL 66 +#define CS_K_PPS_JITTER 67 +#define CS_K_PPS_CALIBDUR 68 +#define CS_K_PPS_CALIBS 69 +#define CS_K_PPS_CALIBERRS 70 +#define CS_K_PPS_JITEXC 71 +#define CS_K_PPS_STBEXC 72 +#define CS_KERN_FIRST CS_K_OFFSET +#define CS_KERN_LAST CS_K_PPS_STBEXC +#define CS_IOSTATS_RESET 73 +#define CS_TOTAL_RBUF 74 +#define CS_FREE_RBUF 75 +#define CS_USED_RBUF 76 +#define CS_RBUF_LOWATER 77 +#define CS_IO_DROPPED 78 +#define CS_IO_IGNORED 79 +#define CS_IO_RECEIVED 80 +#define CS_IO_SENT 81 +#define CS_IO_SENDFAILED 82 +#define CS_IO_WAKEUPS 83 +#define CS_IO_GOODWAKEUPS 84 +#define CS_TIMERSTATS_RESET 85 +#define CS_TIMER_OVERRUNS 86 +#define CS_TIMER_XMTS 87 +#define CS_FUZZ 88 +#define CS_WANDER_THRESH 89 +#define CS_LEAPSMEARINTV 90 +#define CS_LEAPSMEAROFFS 91 +#define CS_MAX_NOAUTOKEY CS_LEAPSMEAROFFS +#ifdef AUTOKEY +#define CS_FLAGS (1 + CS_MAX_NOAUTOKEY) +#define CS_HOST (2 + CS_MAX_NOAUTOKEY) +#define CS_PUBLIC (3 + CS_MAX_NOAUTOKEY) +#define CS_CERTIF (4 + CS_MAX_NOAUTOKEY) +#define CS_SIGNATURE (5 + CS_MAX_NOAUTOKEY) +#define CS_REVTIME (6 + CS_MAX_NOAUTOKEY) +#define CS_IDENT (7 + CS_MAX_NOAUTOKEY) +#define CS_DIGEST (8 + CS_MAX_NOAUTOKEY) +#define CS_MAXCODE CS_DIGEST +#else /* !AUTOKEY follows */ +#define CS_MAXCODE CS_MAX_NOAUTOKEY +#endif /* !AUTOKEY */ + +/* + * Peer variables we understand + */ +#define CP_CONFIG 1 +#define CP_AUTHENABLE 2 +#define CP_AUTHENTIC 3 +#define CP_SRCADR 4 +#define CP_SRCPORT 5 +#define CP_DSTADR 6 +#define CP_DSTPORT 7 +#define CP_LEAP 8 +#define CP_HMODE 9 +#define CP_STRATUM 10 +#define CP_PPOLL 11 +#define CP_HPOLL 12 +#define CP_PRECISION 13 +#define CP_ROOTDELAY 14 +#define CP_ROOTDISPERSION 15 +#define CP_REFID 16 +#define CP_REFTIME 17 +#define CP_ORG 18 +#define CP_REC 19 +#define CP_XMT 20 +#define CP_REACH 21 +#define CP_UNREACH 22 +#define CP_TIMER 23 +#define CP_DELAY 24 +#define CP_OFFSET 25 +#define CP_JITTER 26 +#define CP_DISPERSION 27 +#define CP_KEYID 28 +#define CP_FILTDELAY 29 +#define CP_FILTOFFSET 30 +#define CP_PMODE 31 +#define CP_RECEIVED 32 +#define CP_SENT 33 +#define CP_FILTERROR 34 +#define CP_FLASH 35 +#define CP_TTL 36 +#define CP_VARLIST 37 +#define CP_IN 38 +#define CP_OUT 39 +#define CP_RATE 40 +#define CP_BIAS 41 +#define CP_SRCHOST 42 +#define CP_TIMEREC 43 +#define CP_TIMEREACH 44 +#define CP_BADAUTH 45 +#define CP_BOGUSORG 46 +#define CP_OLDPKT 47 +#define CP_SELDISP 48 +#define CP_SELBROKEN 49 +#define CP_CANDIDATE 50 +#define CP_MAX_NOAUTOKEY CP_CANDIDATE +#ifdef AUTOKEY +#define CP_FLAGS (1 + CP_MAX_NOAUTOKEY) +#define CP_HOST (2 + CP_MAX_NOAUTOKEY) +#define CP_VALID (3 + CP_MAX_NOAUTOKEY) +#define CP_INITSEQ (4 + CP_MAX_NOAUTOKEY) +#define CP_INITKEY (5 + CP_MAX_NOAUTOKEY) +#define CP_INITTSP (6 + CP_MAX_NOAUTOKEY) +#define CP_SIGNATURE (7 + CP_MAX_NOAUTOKEY) +#define CP_IDENT (8 + CP_MAX_NOAUTOKEY) +#define CP_MAXCODE CP_IDENT +#else /* !AUTOKEY follows */ +#define CP_MAXCODE CP_MAX_NOAUTOKEY +#endif /* !AUTOKEY */ + +/* + * Clock variables we understand + */ +#define CC_TYPE 1 +#define CC_TIMECODE 2 +#define CC_POLL 3 +#define CC_NOREPLY 4 +#define CC_BADFORMAT 5 +#define CC_BADDATA 6 +#define CC_FUDGETIME1 7 +#define CC_FUDGETIME2 8 +#define CC_FUDGEVAL1 9 +#define CC_FUDGEVAL2 10 +#define CC_FLAGS 11 +#define CC_DEVICE 12 +#define CC_VARLIST 13 +#define CC_MAXCODE CC_VARLIST + +/* * System variable values. The array can be indexed by the variable * index to find the textual name. */ -static struct ctl_var sys_var[] = { +static const struct ctl_var sys_var[] = { { 0, PADDING, "" }, /* 0 */ { CS_LEAP, RW, "leap" }, /* 1 */ { CS_STRATUM, RO, "stratum" }, /* 2 */ { CS_PRECISION, RO, "precision" }, /* 3 */ { CS_ROOTDELAY, RO, "rootdelay" }, /* 4 */ - { CS_ROOTDISPERSION, RO, "rootdispersion" }, /* 5 */ + { CS_ROOTDISPERSION, RO, "rootdisp" }, /* 5 */ { CS_REFID, RO, "refid" }, /* 6 */ { CS_REFTIME, RO, "reftime" }, /* 7 */ - { CS_POLL, RO, "poll" }, /* 8 */ + { CS_POLL, RO, "tc" }, /* 8 */ { CS_PEERID, RO, "peer" }, /* 9 */ - { CS_STATE, RO, "state" }, /* 10 */ - { CS_OFFSET, RO, "offset" }, /* 11 */ - { CS_DRIFT, RO, "frequency" }, /* 12 */ - { CS_JITTER, RO, "jitter" }, /* 13 */ - { CS_ERROR, RO, "noise" }, /* 14 */ - { CS_CLOCK, RO, "clock" }, /* 15 */ - { CS_PROCESSOR, RO, "processor" }, /* 16 */ - { CS_SYSTEM, RO, "system" }, /* 17 */ - { CS_VERSION, RO, "version" }, /* 18 */ - { CS_STABIL, RO, "stability" }, /* 19 */ - { CS_VARLIST, RO, "sys_var_list" }, /* 20 */ -#ifdef OPENSSL - { CS_FLAGS, RO, "flags" }, /* 21 */ - { CS_HOST, RO, "hostname" }, /* 22 */ - { CS_PUBLIC, RO, "update" }, /* 23 */ - { CS_CERTIF, RO, "cert" }, /* 24 */ - { CS_REVTIME, RO, "expire" }, /* 25 */ - { CS_LEAPTAB, RO, "leapsec" }, /* 26 */ - { CS_TAI, RO, "tai" }, /* 27 */ - { CS_DIGEST, RO, "signature" }, /* 28 */ - { CS_IDENT, RO, "ident" }, /* 29 */ - { CS_REVOKE, RO, "expire" }, /* 30 */ -#endif /* OPENSSL */ - { 0, EOV, "" } /* 21/31 */ + { CS_OFFSET, RO, "offset" }, /* 10 */ + { CS_DRIFT, RO, "frequency" }, /* 11 */ + { CS_JITTER, RO, "sys_jitter" }, /* 12 */ + { CS_ERROR, RO, "clk_jitter" }, /* 13 */ + { CS_CLOCK, RO, "clock" }, /* 14 */ + { CS_PROCESSOR, RO, "processor" }, /* 15 */ + { CS_SYSTEM, RO, "system" }, /* 16 */ + { CS_VERSION, RO, "version" }, /* 17 */ + { CS_STABIL, RO, "clk_wander" }, /* 18 */ + { CS_VARLIST, RO, "sys_var_list" }, /* 19 */ + { CS_TAI, RO, "tai" }, /* 20 */ + { CS_LEAPTAB, RO, "leapsec" }, /* 21 */ + { CS_LEAPEND, RO, "expire" }, /* 22 */ + { CS_RATE, RO, "mintc" }, /* 23 */ + { CS_MRU_ENABLED, RO, "mru_enabled" }, /* 24 */ + { CS_MRU_DEPTH, RO, "mru_depth" }, /* 25 */ + { CS_MRU_DEEPEST, RO, "mru_deepest" }, /* 26 */ + { CS_MRU_MINDEPTH, RO, "mru_mindepth" }, /* 27 */ + { CS_MRU_MAXAGE, RO, "mru_maxage" }, /* 28 */ + { CS_MRU_MAXDEPTH, RO, "mru_maxdepth" }, /* 29 */ + { CS_MRU_MEM, RO, "mru_mem" }, /* 30 */ + { CS_MRU_MAXMEM, RO, "mru_maxmem" }, /* 31 */ + { CS_SS_UPTIME, RO, "ss_uptime" }, /* 32 */ + { CS_SS_RESET, RO, "ss_reset" }, /* 33 */ + { CS_SS_RECEIVED, RO, "ss_received" }, /* 34 */ + { CS_SS_THISVER, RO, "ss_thisver" }, /* 35 */ + { CS_SS_OLDVER, RO, "ss_oldver" }, /* 36 */ + { CS_SS_BADFORMAT, RO, "ss_badformat" }, /* 37 */ + { CS_SS_BADAUTH, RO, "ss_badauth" }, /* 38 */ + { CS_SS_DECLINED, RO, "ss_declined" }, /* 39 */ + { CS_SS_RESTRICTED, RO, "ss_restricted" }, /* 40 */ + { CS_SS_LIMITED, RO, "ss_limited" }, /* 41 */ + { CS_SS_KODSENT, RO, "ss_kodsent" }, /* 42 */ + { CS_SS_PROCESSED, RO, "ss_processed" }, /* 43 */ + { CS_PEERADR, RO, "peeradr" }, /* 44 */ + { CS_PEERMODE, RO, "peermode" }, /* 45 */ + { CS_BCASTDELAY, RO, "bcastdelay" }, /* 46 */ + { CS_AUTHDELAY, RO, "authdelay" }, /* 47 */ + { CS_AUTHKEYS, RO, "authkeys" }, /* 48 */ + { CS_AUTHFREEK, RO, "authfreek" }, /* 49 */ + { CS_AUTHKLOOKUPS, RO, "authklookups" }, /* 50 */ + { CS_AUTHKNOTFOUND, RO, "authknotfound" }, /* 51 */ + { CS_AUTHKUNCACHED, RO, "authkuncached" }, /* 52 */ + { CS_AUTHKEXPIRED, RO, "authkexpired" }, /* 53 */ + { CS_AUTHENCRYPTS, RO, "authencrypts" }, /* 54 */ + { CS_AUTHDECRYPTS, RO, "authdecrypts" }, /* 55 */ + { CS_AUTHRESET, RO, "authreset" }, /* 56 */ + { CS_K_OFFSET, RO, "koffset" }, /* 57 */ + { CS_K_FREQ, RO, "kfreq" }, /* 58 */ + { CS_K_MAXERR, RO, "kmaxerr" }, /* 59 */ + { CS_K_ESTERR, RO, "kesterr" }, /* 60 */ + { CS_K_STFLAGS, RO, "kstflags" }, /* 61 */ + { CS_K_TIMECONST, RO, "ktimeconst" }, /* 62 */ + { CS_K_PRECISION, RO, "kprecis" }, /* 63 */ + { CS_K_FREQTOL, RO, "kfreqtol" }, /* 64 */ + { CS_K_PPS_FREQ, RO, "kppsfreq" }, /* 65 */ + { CS_K_PPS_STABIL, RO, "kppsstab" }, /* 66 */ + { CS_K_PPS_JITTER, RO, "kppsjitter" }, /* 67 */ + { CS_K_PPS_CALIBDUR, RO, "kppscalibdur" }, /* 68 */ + { CS_K_PPS_CALIBS, RO, "kppscalibs" }, /* 69 */ + { CS_K_PPS_CALIBERRS, RO, "kppscaliberrs" }, /* 70 */ + { CS_K_PPS_JITEXC, RO, "kppsjitexc" }, /* 71 */ + { CS_K_PPS_STBEXC, RO, "kppsstbexc" }, /* 72 */ + { CS_IOSTATS_RESET, RO, "iostats_reset" }, /* 73 */ + { CS_TOTAL_RBUF, RO, "total_rbuf" }, /* 74 */ + { CS_FREE_RBUF, RO, "free_rbuf" }, /* 75 */ + { CS_USED_RBUF, RO, "used_rbuf" }, /* 76 */ + { CS_RBUF_LOWATER, RO, "rbuf_lowater" }, /* 77 */ + { CS_IO_DROPPED, RO, "io_dropped" }, /* 78 */ + { CS_IO_IGNORED, RO, "io_ignored" }, /* 79 */ + { CS_IO_RECEIVED, RO, "io_received" }, /* 80 */ + { CS_IO_SENT, RO, "io_sent" }, /* 81 */ + { CS_IO_SENDFAILED, RO, "io_sendfailed" }, /* 82 */ + { CS_IO_WAKEUPS, RO, "io_wakeups" }, /* 83 */ + { CS_IO_GOODWAKEUPS, RO, "io_goodwakeups" }, /* 84 */ + { CS_TIMERSTATS_RESET, RO, "timerstats_reset" },/* 85 */ + { CS_TIMER_OVERRUNS, RO, "timer_overruns" }, /* 86 */ + { CS_TIMER_XMTS, RO, "timer_xmts" }, /* 87 */ + { CS_FUZZ, RO, "fuzz" }, /* 88 */ + { CS_WANDER_THRESH, RO, "clk_wander_threshold" }, /* 89 */ + + { CS_LEAPSMEARINTV, RO, "leapsmearinterval" }, /* 90 */ + { CS_LEAPSMEAROFFS, RO, "leapsmearoffset" }, /* 91 */ + +#ifdef AUTOKEY + { CS_FLAGS, RO, "flags" }, /* 1 + CS_MAX_NOAUTOKEY */ + { CS_HOST, RO, "host" }, /* 2 + CS_MAX_NOAUTOKEY */ + { CS_PUBLIC, RO, "update" }, /* 3 + CS_MAX_NOAUTOKEY */ + { CS_CERTIF, RO, "cert" }, /* 4 + CS_MAX_NOAUTOKEY */ + { CS_SIGNATURE, RO, "signature" }, /* 5 + CS_MAX_NOAUTOKEY */ + { CS_REVTIME, RO, "until" }, /* 6 + CS_MAX_NOAUTOKEY */ + { CS_IDENT, RO, "ident" }, /* 7 + CS_MAX_NOAUTOKEY */ + { CS_DIGEST, RO, "digest" }, /* 8 + CS_MAX_NOAUTOKEY */ +#endif /* AUTOKEY */ + { 0, EOV, "" } /* 87/95 */ }; -static struct ctl_var *ext_sys_var = (struct ctl_var *)0; +static struct ctl_var *ext_sys_var = NULL; /* * System variables we print by default (in fuzzball order, * more-or-less) */ -static u_char def_sys_var[] = { +static const u_char def_sys_var[] = { CS_VERSION, CS_PROCESSOR, CS_SYSTEM, @@ -156,27 +452,31 @@ static u_char def_sys_var[] = { CS_PRECISION, CS_ROOTDELAY, CS_ROOTDISPERSION, - CS_PEERID, CS_REFID, CS_REFTIME, - CS_POLL, CS_CLOCK, - CS_STATE, + CS_PEERID, + CS_POLL, + CS_RATE, CS_OFFSET, CS_DRIFT, CS_JITTER, CS_ERROR, CS_STABIL, -#ifdef OPENSSL + CS_TAI, + CS_LEAPTAB, + CS_LEAPEND, + CS_LEAPSMEARINTV, + CS_LEAPSMEAROFFS, +#ifdef AUTOKEY CS_HOST, - CS_DIGEST, + CS_IDENT, CS_FLAGS, + CS_DIGEST, + CS_SIGNATURE, CS_PUBLIC, - CS_IDENT, - CS_LEAPTAB, - CS_TAI, CS_CERTIF, -#endif /* OPENSSL */ +#endif /* AUTOKEY */ 0 }; @@ -184,11 +484,11 @@ static u_char def_sys_var[] = { /* * Peer variable list */ -static struct ctl_var peer_var[] = { +static const struct ctl_var peer_var[] = { { 0, PADDING, "" }, /* 0 */ { CP_CONFIG, RO, "config" }, /* 1 */ { CP_AUTHENABLE, RO, "authenable" }, /* 2 */ - { CP_AUTHENTIC, RO, "authentic" }, /* 3 */ + { CP_AUTHENTIC, RO, "authentic" }, /* 3 */ { CP_SRCADR, RO, "srcadr" }, /* 4 */ { CP_SRCPORT, RO, "srcport" }, /* 5 */ { CP_DSTADR, RO, "dstadr" }, /* 6 */ @@ -200,12 +500,12 @@ static struct ctl_var peer_var[] = { { CP_HPOLL, RO, "hpoll" }, /* 12 */ { CP_PRECISION, RO, "precision" }, /* 13 */ { CP_ROOTDELAY, RO, "rootdelay" }, /* 14 */ - { CP_ROOTDISPERSION, RO, "rootdispersion" }, /* 15 */ + { CP_ROOTDISPERSION, RO, "rootdisp" }, /* 15 */ { CP_REFID, RO, "refid" }, /* 16 */ { CP_REFTIME, RO, "reftime" }, /* 17 */ { CP_ORG, RO, "org" }, /* 18 */ { CP_REC, RO, "rec" }, /* 19 */ - { CP_XMT, RO, "xmt" }, /* 20 */ + { CP_XMT, RO, "xleave" }, /* 20 */ { CP_REACH, RO, "reach" }, /* 21 */ { CP_UNREACH, RO, "unreach" }, /* 22 */ { CP_TIMER, RO, "timer" }, /* 23 */ @@ -214,49 +514,68 @@ static struct ctl_var peer_var[] = { { CP_JITTER, RO, "jitter" }, /* 26 */ { CP_DISPERSION, RO, "dispersion" }, /* 27 */ { CP_KEYID, RO, "keyid" }, /* 28 */ - { CP_FILTDELAY, RO, "filtdelay=" }, /* 29 */ - { CP_FILTOFFSET, RO, "filtoffset=" }, /* 30 */ + { CP_FILTDELAY, RO, "filtdelay" }, /* 29 */ + { CP_FILTOFFSET, RO, "filtoffset" }, /* 30 */ { CP_PMODE, RO, "pmode" }, /* 31 */ { CP_RECEIVED, RO, "received"}, /* 32 */ { CP_SENT, RO, "sent" }, /* 33 */ - { CP_FILTERROR, RO, "filtdisp=" }, /* 34 */ + { CP_FILTERROR, RO, "filtdisp" }, /* 34 */ { CP_FLASH, RO, "flash" }, /* 35 */ { CP_TTL, RO, "ttl" }, /* 36 */ { CP_VARLIST, RO, "peer_var_list" }, /* 37 */ -#ifdef OPENSSL - { CP_FLAGS, RO, "flags" }, /* 38 */ - { CP_HOST, RO, "hostname" }, /* 39 */ - { CP_VALID, RO, "valid" }, /* 40 */ - { CP_INITSEQ, RO, "initsequence" }, /* 41 */ - { CP_INITKEY, RO, "initkey" }, /* 42 */ - { CP_INITTSP, RO, "timestamp" }, /* 43 */ - { CP_DIGEST, RO, "signature" }, /* 44 */ - { CP_IDENT, RO, "trust" }, /* 45 */ -#endif /* OPENSSL */ - { 0, EOV, "" } /* 38/46 */ + { CP_IN, RO, "in" }, /* 38 */ + { CP_OUT, RO, "out" }, /* 39 */ + { CP_RATE, RO, "headway" }, /* 40 */ + { CP_BIAS, RO, "bias" }, /* 41 */ + { CP_SRCHOST, RO, "srchost" }, /* 42 */ + { CP_TIMEREC, RO, "timerec" }, /* 43 */ + { CP_TIMEREACH, RO, "timereach" }, /* 44 */ + { CP_BADAUTH, RO, "badauth" }, /* 45 */ + { CP_BOGUSORG, RO, "bogusorg" }, /* 46 */ + { CP_OLDPKT, RO, "oldpkt" }, /* 47 */ + { CP_SELDISP, RO, "seldisp" }, /* 48 */ + { CP_SELBROKEN, RO, "selbroken" }, /* 49 */ + { CP_CANDIDATE, RO, "candidate" }, /* 50 */ +#ifdef AUTOKEY + { CP_FLAGS, RO, "flags" }, /* 1 + CP_MAX_NOAUTOKEY */ + { CP_HOST, RO, "host" }, /* 2 + CP_MAX_NOAUTOKEY */ + { CP_VALID, RO, "valid" }, /* 3 + CP_MAX_NOAUTOKEY */ + { CP_INITSEQ, RO, "initsequence" }, /* 4 + CP_MAX_NOAUTOKEY */ + { CP_INITKEY, RO, "initkey" }, /* 5 + CP_MAX_NOAUTOKEY */ + { CP_INITTSP, RO, "timestamp" }, /* 6 + CP_MAX_NOAUTOKEY */ + { CP_SIGNATURE, RO, "signature" }, /* 7 + CP_MAX_NOAUTOKEY */ + { CP_IDENT, RO, "ident" }, /* 8 + CP_MAX_NOAUTOKEY */ +#endif /* AUTOKEY */ + { 0, EOV, "" } /* 50/58 */ }; /* * Peer variables we print by default */ -static u_char def_peer_var[] = { +static const u_char def_peer_var[] = { CP_SRCADR, CP_SRCPORT, + CP_SRCHOST, CP_DSTADR, CP_DSTPORT, + CP_OUT, + CP_IN, CP_LEAP, CP_STRATUM, CP_PRECISION, CP_ROOTDELAY, CP_ROOTDISPERSION, CP_REFID, + CP_REFTIME, + CP_REC, CP_REACH, CP_UNREACH, CP_HMODE, CP_PMODE, CP_HPOLL, CP_PPOLL, + CP_RATE, CP_FLASH, CP_KEYID, CP_TTL, @@ -264,21 +583,19 @@ static u_char def_peer_var[] = { CP_DELAY, CP_DISPERSION, CP_JITTER, - CP_REFTIME, - CP_ORG, - CP_REC, CP_XMT, + CP_BIAS, CP_FILTDELAY, CP_FILTOFFSET, CP_FILTERROR, -#ifdef OPENSSL +#ifdef AUTOKEY CP_HOST, - CP_DIGEST, - CP_VALID, CP_FLAGS, - CP_IDENT, + CP_SIGNATURE, + CP_VALID, CP_INITSEQ, -#endif /* OPENSSL */ + CP_IDENT, +#endif /* AUTOKEY */ 0 }; @@ -287,7 +604,7 @@ static u_char def_peer_var[] = { /* * Clock variable list */ -static struct ctl_var clock_var[] = { +static const struct ctl_var clock_var[] = { { 0, PADDING, "" }, /* 0 */ { CC_TYPE, RO, "type" }, /* 1 */ { CC_TIMECODE, RO, "timecode" }, /* 2 */ @@ -309,7 +626,7 @@ static struct ctl_var clock_var[] = { /* * Clock variables printed by default */ -static u_char def_clock_var[] = { +static const u_char def_clock_var[] = { CC_DEVICE, CC_TYPE, /* won't be output if device = known */ CC_TIMECODE, @@ -326,6 +643,11 @@ static u_char def_clock_var[] = { }; #endif +/* + * MRU string constants shared by send_mru_entry() and read_mru_list(). + */ +static const char addr_fmt[] = "addr.%d"; +static const char last_fmt[] = "last.%d"; /* * System and processor definitions. @@ -335,11 +657,11 @@ static u_char def_clock_var[] = { # define STR_SYSTEM "UNIX" # endif # ifndef STR_PROCESSOR -# define STR_PROCESSOR "unknown" +# define STR_PROCESSOR "unknown" # endif -static char str_system[] = STR_SYSTEM; -static char str_processor[] = STR_PROCESSOR; +static const char str_system[] = STR_SYSTEM; +static const char str_processor[] = STR_PROCESSOR; #else # include <sys/utsname.h> static struct utsname utsnamebuf; @@ -352,7 +674,7 @@ static struct utsname utsnamebuf; * timed out. */ /* ntp_request.c */ -struct ctl_trap ctl_trap[CTL_MAXTRAPS]; +struct ctl_trap ctl_traps[CTL_MAXTRAPS]; int num_ctl_traps; /* @@ -369,53 +691,57 @@ int num_ctl_traps; * the reference clock driver doesn't set peer->sstclktype to something * different than CTL_SST_TS_UNSPEC. */ -static u_char clocktypes[] = { - CTL_SST_TS_NTP, /* REFCLK_NONE (0) */ +#ifdef REFCLOCK +static const u_char clocktypes[] = { + CTL_SST_TS_NTP, /* REFCLK_NONE (0) */ CTL_SST_TS_LOCAL, /* REFCLK_LOCALCLOCK (1) */ - CTL_SST_TS_UHF, /* deprecated REFCLK_GPS_TRAK (2) */ + CTL_SST_TS_UHF, /* deprecated REFCLK_GPS_TRAK (2) */ CTL_SST_TS_HF, /* REFCLK_WWV_PST (3) */ CTL_SST_TS_LF, /* REFCLK_WWVB_SPECTRACOM (4) */ - CTL_SST_TS_UHF, /* REFCLK_TRUETIME (5) */ - CTL_SST_TS_UHF, /* REFCLK_GOES_TRAK (6) IRIG_AUDIO? */ + CTL_SST_TS_UHF, /* REFCLK_TRUETIME (5) */ + CTL_SST_TS_UHF, /* REFCLK_IRIG_AUDIO (6) */ CTL_SST_TS_HF, /* REFCLK_CHU (7) */ CTL_SST_TS_LF, /* REFCLOCK_PARSE (default) (8) */ CTL_SST_TS_LF, /* REFCLK_GPS_MX4200 (9) */ - CTL_SST_TS_UHF, /* REFCLK_GPS_AS2201 (10) */ - CTL_SST_TS_UHF, /* REFCLK_GPS_ARBITER (11) */ - CTL_SST_TS_UHF, /* REFCLK_IRIG_TPRO (12) */ + CTL_SST_TS_UHF, /* REFCLK_GPS_AS2201 (10) */ + CTL_SST_TS_UHF, /* REFCLK_GPS_ARBITER (11) */ + CTL_SST_TS_UHF, /* REFCLK_IRIG_TPRO (12) */ CTL_SST_TS_ATOM, /* REFCLK_ATOM_LEITCH (13) */ CTL_SST_TS_LF, /* deprecated REFCLK_MSF_EES (14) */ - CTL_SST_TS_NTP, /* not used (15) */ - CTL_SST_TS_UHF, /* REFCLK_IRIG_BANCOMM (16) */ - CTL_SST_TS_UHF, /* REFCLK_GPS_DATU (17) */ + CTL_SST_TS_NTP, /* not used (15) */ + CTL_SST_TS_UHF, /* REFCLK_IRIG_BANCOMM (16) */ + CTL_SST_TS_UHF, /* REFCLK_GPS_DATU (17) */ CTL_SST_TS_TELEPHONE, /* REFCLK_NIST_ACTS (18) */ CTL_SST_TS_HF, /* REFCLK_WWV_HEATH (19) */ - CTL_SST_TS_UHF, /* REFCLK_GPS_NMEA (20) */ - CTL_SST_TS_UHF, /* REFCLK_GPS_VME (21) */ + CTL_SST_TS_UHF, /* REFCLK_GPS_NMEA (20) */ + CTL_SST_TS_UHF, /* REFCLK_GPS_VME (21) */ CTL_SST_TS_ATOM, /* REFCLK_ATOM_PPS (22) */ CTL_SST_TS_NTP, /* not used (23) */ CTL_SST_TS_NTP, /* not used (24) */ - CTL_SST_TS_NTP, /* not used (25) */ - CTL_SST_TS_UHF, /* REFCLK_GPS_HP (26) */ - CTL_SST_TS_TELEPHONE, /* REFCLK_ARCRON_MSF (27) */ - CTL_SST_TS_TELEPHONE, /* REFCLK_SHM (28) */ - CTL_SST_TS_UHF, /* REFCLK_PALISADE (29) */ - CTL_SST_TS_UHF, /* REFCLK_ONCORE (30) */ + CTL_SST_TS_NTP, /* not used (25) */ + CTL_SST_TS_UHF, /* REFCLK_GPS_HP (26) */ + CTL_SST_TS_LF, /* REFCLK_ARCRON_MSF (27) */ + CTL_SST_TS_UHF, /* REFCLK_SHM (28) */ + CTL_SST_TS_UHF, /* REFCLK_PALISADE (29) */ + CTL_SST_TS_UHF, /* REFCLK_ONCORE (30) */ CTL_SST_TS_UHF, /* REFCLK_JUPITER (31) */ CTL_SST_TS_LF, /* REFCLK_CHRONOLOG (32) */ CTL_SST_TS_LF, /* REFCLK_DUMBCLOCK (33) */ CTL_SST_TS_LF, /* REFCLK_ULINK (34) */ CTL_SST_TS_LF, /* REFCLK_PCF (35) */ - CTL_SST_TS_LF, /* REFCLK_WWV (36) */ + CTL_SST_TS_HF, /* REFCLK_WWV (36) */ CTL_SST_TS_LF, /* REFCLK_FG (37) */ - CTL_SST_TS_UHF, /* REFCLK_HOPF_SERIAL (38) */ + CTL_SST_TS_UHF, /* REFCLK_HOPF_SERIAL (38) */ CTL_SST_TS_UHF, /* REFCLK_HOPF_PCI (39) */ CTL_SST_TS_LF, /* REFCLK_JJY (40) */ CTL_SST_TS_UHF, /* REFCLK_TT560 (41) */ CTL_SST_TS_UHF, /* REFCLK_ZYFER (42) */ CTL_SST_TS_UHF, /* REFCLK_RIPENCC (43) */ CTL_SST_TS_UHF, /* REFCLK_NEOCLOCK4X (44) */ + CTL_SST_TS_UHF, /* REFCLK_TSYNCPCI (45) */ + CTL_SST_TS_UHF /* REFCLK_GPSDJSON (46) */ }; +#endif /* REFCLOCK */ /* @@ -436,17 +762,17 @@ static u_char ctl_sys_num_events; u_long ctltimereset; /* time stats reset */ u_long numctlreq; /* number of requests we've received */ u_long numctlbadpkts; /* number of bad control packets */ -u_long numctlresponses; /* number of resp packets sent with data */ -u_long numctlfrags; /* number of fragments sent */ +u_long numctlresponses; /* number of resp packets sent with data */ +u_long numctlfrags; /* number of fragments sent */ u_long numctlerrors; /* number of error responses sent */ u_long numctltooshort; /* number of too short input packets */ -u_long numctlinputresp; /* number of responses on input */ -u_long numctlinputfrag; /* number of fragments on input */ +u_long numctlinputresp; /* number of responses on input */ +u_long numctlinputfrag; /* number of fragments on input */ u_long numctlinputerr; /* number of input pkts with err bit set */ -u_long numctlbadoffset; /* number of input pkts with nonzero offset */ +u_long numctlbadoffset; /* number of input pkts with nonzero offset */ u_long numctlbadversion; /* number of input pkts with unknown version */ u_long numctldatatooshort; /* data too short for count */ -u_long numctlbadop; /* bad op code found in packet */ +u_long numctlbadop; /* bad op code found in packet */ u_long numasyncmsgs; /* number of async messages we've sent */ /* @@ -460,12 +786,14 @@ static struct ntp_control rpkt; static u_char res_version; static u_char res_opcode; static associd_t res_associd; -static int res_offset; +static u_short res_frags; /* datagrams in this response */ +static int res_offset; /* offset of payload in response */ static u_char * datapt; static u_char * dataend; static int datalinelen; +static int datasent; /* flag to avoid initial ", " */ static int datanotbinflag; -static struct sockaddr_storage *rmt_addr; +static sockaddr_u *rmt_addr; static struct interface *lcl_inter; static u_char res_authenticate; @@ -474,7 +802,7 @@ static keyid_t res_keyid; #define MAXDATALINELEN (72) -static u_char res_async; /* set to 1 if this is async trap response */ +static u_char res_async; /* sending async trap response? */ /* * Pointers for saving state when decoding request packets @@ -482,13 +810,17 @@ static u_char res_async; /* set to 1 if this is async trap response */ static char *reqpt; static char *reqend; +#ifndef MIN +#define MIN(a, b) (((a) <= (b)) ? (a) : (b)) +#endif + /* * init_control - initialize request data */ void init_control(void) { - int i; + size_t i; #ifdef HAVE_UNAME uname(&utsnamebuf); @@ -501,8 +833,8 @@ init_control(void) ctl_sys_num_events = 0; num_ctl_traps = 0; - for (i = 0; i < CTL_MAXTRAPS; i++) - ctl_trap[i].tr_flags = 0; + for (i = 0; i < COUNTOF(ctl_traps); i++) + ctl_traps[i].tr_flags = 0; } @@ -511,39 +843,178 @@ init_control(void) */ static void ctl_error( - int errcode + u_char errcode ) { -#ifdef DEBUG - if (debug >= 4) - printf("sending control error %d\n", errcode); -#endif + int maclen; + + numctlerrors++; + DPRINTF(3, ("sending control error %u\n", errcode)); + /* * Fill in the fields. We assume rpkt.sequence and rpkt.associd * have already been filled in. */ - rpkt.r_m_e_op = (u_char) (CTL_RESPONSE|CTL_ERROR|(res_opcode & - CTL_OP_MASK)); - rpkt.status = htons((u_short) ((errcode<<8) & 0xff00)); + rpkt.r_m_e_op = (u_char)CTL_RESPONSE | CTL_ERROR | + (res_opcode & CTL_OP_MASK); + rpkt.status = htons((u_short)(errcode << 8) & 0xff00); rpkt.count = 0; /* * send packet and bump counters */ if (res_authenticate && sys_authenticate) { - int maclen; - - *(u_int32 *)((u_char *)&rpkt + CTL_HEADER_LEN) = - htonl(res_keyid); maclen = authencrypt(res_keyid, (u_int32 *)&rpkt, - CTL_HEADER_LEN); - sendpkt(rmt_addr, lcl_inter, -2, (struct pkt *)&rpkt, - CTL_HEADER_LEN + maclen); + CTL_HEADER_LEN); + sendpkt(rmt_addr, lcl_inter, -2, (void *)&rpkt, + CTL_HEADER_LEN + maclen); + } else + sendpkt(rmt_addr, lcl_inter, -3, (void *)&rpkt, + CTL_HEADER_LEN); +} + +/* + * save_config - Implements ntpq -c "saveconfig <filename>" + * Writes current configuration including any runtime + * changes by ntpq's :config or config-from-file + */ +void +save_config( + struct recvbuf *rbufp, + int restrict_mask + ) +{ + /* block directory traversal by searching for characters that + * indicate directory components in a file path. + * + * Conceptually we should be searching for DIRSEP in filename, + * however Windows actually recognizes both forward and + * backslashes as equivalent directory separators at the API + * level. On POSIX systems we could allow '\\' but such + * filenames are tricky to manipulate from a shell, so just + * reject both types of slashes on all platforms. + */ + /* TALOS-CAN-0062: block directory traversal for VMS, too */ + static const char * illegal_in_filename = +#if defined(VMS) + ":[]" /* do not allow drive and path components here */ +#elif defined(SYS_WINNT) + ":\\/" /* path and drive separators */ +#else + "\\/" /* separator and critical char for POSIX */ +#endif + ; + + + char reply[128]; +#ifdef SAVECONFIG + char filespec[128]; + char filename[128]; + char fullpath[512]; + const char savedconfig_eq[] = "savedconfig="; + char savedconfig[sizeof(savedconfig_eq) + sizeof(filename)]; + time_t now; + int fd; + FILE *fptr; +#endif + + if (RES_NOMODIFY & restrict_mask) { + snprintf(reply, sizeof(reply), + "saveconfig prohibited by restrict ... nomodify"); + ctl_putdata(reply, strlen(reply), 0); + ctl_flushpkt(0); + NLOG(NLOG_SYSINFO) + msyslog(LOG_NOTICE, + "saveconfig from %s rejected due to nomodify restriction", + stoa(&rbufp->recv_srcadr)); + sys_restricted++; + return; + } + +#ifdef SAVECONFIG + if (NULL == saveconfigdir) { + snprintf(reply, sizeof(reply), + "saveconfig prohibited, no saveconfigdir configured"); + ctl_putdata(reply, strlen(reply), 0); + ctl_flushpkt(0); + NLOG(NLOG_SYSINFO) + msyslog(LOG_NOTICE, + "saveconfig from %s rejected, no saveconfigdir", + stoa(&rbufp->recv_srcadr)); + return; + } + + if (0 == reqend - reqpt) + return; + + strlcpy(filespec, reqpt, sizeof(filespec)); + time(&now); + + /* + * allow timestamping of the saved config filename with + * strftime() format such as: + * ntpq -c "saveconfig ntp-%Y%m%d-%H%M%S.conf" + * XXX: Nice feature, but not too safe. + */ + if (0 == strftime(filename, sizeof(filename), filespec, + localtime(&now))) + strlcpy(filename, filespec, sizeof(filename)); + + /* block directory/drive traversal */ + /* TALOS-CAN-0062: block directory traversal for VMS, too */ + if (NULL != strpbrk(filename, illegal_in_filename)) { + snprintf(reply, sizeof(reply), + "saveconfig does not allow directory in filename"); + ctl_putdata(reply, strlen(reply), 0); + ctl_flushpkt(0); + msyslog(LOG_NOTICE, + "saveconfig with path from %s rejected", + stoa(&rbufp->recv_srcadr)); + return; + } + + snprintf(fullpath, sizeof(fullpath), "%s%s", + saveconfigdir, filename); + + fd = open(fullpath, O_CREAT | O_TRUNC | O_WRONLY, + S_IRUSR | S_IWUSR); + if (-1 == fd) + fptr = NULL; + else + fptr = fdopen(fd, "w"); + + if (NULL == fptr || -1 == dump_all_config_trees(fptr, 1)) { + snprintf(reply, sizeof(reply), + "Unable to save configuration to file %s", + filename); + msyslog(LOG_ERR, + "saveconfig %s from %s failed", filename, + stoa(&rbufp->recv_srcadr)); } else { - sendpkt(rmt_addr, lcl_inter, -3, (struct pkt *)&rpkt, - CTL_HEADER_LEN); + snprintf(reply, sizeof(reply), + "Configuration saved to %s", filename); + msyslog(LOG_NOTICE, + "Configuration saved to %s (requested by %s)", + fullpath, stoa(&rbufp->recv_srcadr)); + /* + * save the output filename in system variable + * savedconfig, retrieved with: + * ntpq -c "rv 0 savedconfig" + */ + snprintf(savedconfig, sizeof(savedconfig), "%s%s", + savedconfig_eq, filename); + set_sys_var(savedconfig, strlen(savedconfig) + 1, RO); } - numctlerrors++; + + if (NULL != fptr) + fclose(fptr); +#else /* !SAVECONFIG follows */ + snprintf(reply, sizeof(reply), + "saveconfig unavailable, configured with --disable-saveconfig"); +#endif + + ctl_putdata(reply, strlen(reply), 0); + ctl_flushpkt(0); } @@ -556,17 +1027,15 @@ process_control( int restrict_mask ) { - register struct ntp_control *pkt; - register int req_count; - register int req_data; - register struct ctl_proc *cc; + struct ntp_control *pkt; + int req_count; + int req_data; + const struct ctl_proc *cc; + keyid_t *pkid; int properlen; - int maclen; + size_t maclen; -#ifdef DEBUG - if (debug > 2) - printf("in process_control()\n"); -#endif + DPRINTF(3, ("in process_control()\n")); /* * Save the addresses for error responses @@ -580,20 +1049,17 @@ process_control( * If the length is less than required for the header, or * it is a response or a fragment, ignore this. */ - if (rbufp->recv_length < CTL_HEADER_LEN - || pkt->r_m_e_op & (CTL_RESPONSE|CTL_MORE|CTL_ERROR) + if (rbufp->recv_length < (int)CTL_HEADER_LEN + || (CTL_RESPONSE | CTL_MORE | CTL_ERROR) & pkt->r_m_e_op || pkt->offset != 0) { -#ifdef DEBUG - if (debug) - printf("invalid format in control packet\n"); -#endif - if (rbufp->recv_length < CTL_HEADER_LEN) + DPRINTF(1, ("invalid format in control packet\n")); + if (rbufp->recv_length < (int)CTL_HEADER_LEN) numctltooshort++; - if (pkt->r_m_e_op & CTL_RESPONSE) + if (CTL_RESPONSE & pkt->r_m_e_op) numctlinputresp++; - if (pkt->r_m_e_op & CTL_MORE) + if (CTL_MORE & pkt->r_m_e_op) numctlinputfrag++; - if (pkt->r_m_e_op & CTL_ERROR) + if (CTL_ERROR & pkt->r_m_e_op) numctlinputerr++; if (pkt->offset != 0) numctlbadoffset++; @@ -601,11 +1067,8 @@ process_control( } res_version = PKT_VERSION(pkt->li_vn_mode); if (res_version > NTP_VERSION || res_version < NTP_OLDVERSION) { -#ifdef DEBUG - if (debug) - printf("unknown version %d in control packet\n", - res_version); -#endif + DPRINTF(1, ("unknown version %d in control packet\n", + res_version)); numctlbadversion++; return; } @@ -615,22 +1078,28 @@ process_control( * responses */ rpkt.li_vn_mode = PKT_LI_VN_MODE(sys_leap, res_version, - MODE_CONTROL); + MODE_CONTROL); res_opcode = pkt->r_m_e_op; rpkt.sequence = pkt->sequence; rpkt.associd = pkt->associd; rpkt.status = 0; + res_frags = 1; res_offset = 0; res_associd = htons(pkt->associd); - res_async = 0; - res_authenticate = 0; + res_async = FALSE; + res_authenticate = FALSE; res_keyid = 0; - res_authokay = 0; - req_count = (int)htons(pkt->count); - datanotbinflag = 0; + res_authokay = FALSE; + req_count = (int)ntohs(pkt->count); + datanotbinflag = FALSE; datalinelen = 0; - datapt = rpkt.data; - dataend = &(rpkt.data[CTL_MAX_DATA_LEN]); + datasent = 0; + datapt = rpkt.u.data; + dataend = &rpkt.u.data[CTL_MAX_DATA_LEN]; + + if ((rbufp->recv_length & 0x3) != 0) + DPRINTF(3, ("Control packet length %d unrounded\n", + rbufp->recv_length)); /* * We're set up now. Make sure we've got at least enough @@ -644,54 +1113,37 @@ process_control( } properlen = req_count + CTL_HEADER_LEN; -#ifdef DEBUG - if (debug > 2 && (rbufp->recv_length & 0x3) != 0) - printf("Packet length %d unrounded\n", - rbufp->recv_length); -#endif /* round up proper len to a 8 octet boundary */ properlen = (properlen + 7) & ~7; maclen = rbufp->recv_length - properlen; - if ((rbufp->recv_length & (sizeof(u_long) - 1)) == 0 && + if ((rbufp->recv_length & 3) == 0 && maclen >= MIN_MAC_LEN && maclen <= MAX_MAC_LEN && sys_authenticate) { - res_authenticate = 1; - res_keyid = ntohl(*(u_int32 *)((u_char *)pkt + - properlen)); - -#ifdef DEBUG - if (debug > 2) - printf( - "recv_len %d, properlen %d, wants auth with keyid %08x, MAC length=%d\n", - rbufp->recv_length, properlen, res_keyid, maclen); -#endif - if (!authistrusted(res_keyid)) { -#ifdef DEBUG - if (debug > 2) - printf("invalid keyid %08x\n", - res_keyid); -#endif - } else if (authdecrypt(res_keyid, (u_int32 *)pkt, - rbufp->recv_length - maclen, maclen)) { -#ifdef DEBUG - if (debug > 2) - printf("authenticated okay\n"); -#endif - res_authokay = 1; + res_authenticate = TRUE; + pkid = (void *)((char *)pkt + properlen); + res_keyid = ntohl(*pkid); + DPRINTF(3, ("recv_len %d, properlen %d, wants auth with keyid %08x, MAC length=%zu\n", + rbufp->recv_length, properlen, res_keyid, + maclen)); + + if (!authistrusted(res_keyid)) + DPRINTF(3, ("invalid keyid %08x\n", res_keyid)); + else if (authdecrypt(res_keyid, (u_int32 *)pkt, + rbufp->recv_length - maclen, + maclen)) { + res_authokay = TRUE; + DPRINTF(3, ("authenticated okay\n")); } else { -#ifdef DEBUG - if (debug > 2) - printf("authentication failed\n"); -#endif res_keyid = 0; + DPRINTF(3, ("authentication failed\n")); } } /* * Set up translate pointers */ - reqpt = (char *)pkt->data; + reqpt = (char *)pkt->u.data; reqend = reqpt + req_count; /* @@ -699,13 +1151,11 @@ process_control( */ for (cc = control_codes; cc->control_code != NO_REQUEST; cc++) { if (cc->control_code == res_opcode) { -#ifdef DEBUG - if (debug > 2) - printf("opcode %d, found command handler\n", - res_opcode); -#endif - if (cc->flags == AUTH && (!res_authokay || - res_keyid != ctl_auth_keyid)) { + DPRINTF(3, ("opcode %d, found command handler\n", + res_opcode)); + if (cc->flags == AUTH + && (!res_authokay + || res_keyid != ctl_auth_keyid)) { ctl_error(CERR_PERMISSION); return; } @@ -728,22 +1178,24 @@ process_control( */ u_short ctlpeerstatus( - register struct peer *peer + register struct peer *p ) { - register u_short status; + u_short status; - status = peer->status; - if (peer->flags & FLAG_CONFIG) + status = p->status; + if (FLAG_CONFIG & p->flags) status |= CTL_PST_CONFIG; - if (peer->flags & FLAG_AUTHENABLE) + if (p->keyid) status |= CTL_PST_AUTHENABLE; - if (peer->flags & FLAG_AUTHENTIC) + if (FLAG_AUTHENTIC & p->flags) status |= CTL_PST_AUTHENTIC; - if (peer->reach != 0) + if (p->reach) status |= CTL_PST_REACH; - return (u_short)CTL_PEER_STATUS(status, peer->num_events, - peer->last_event); + if (MDF_TXONLY_MASK & p->cast_flags) + status |= CTL_PST_BCAST; + + return CTL_PEER_STATUS(status, p->num_events, p->last_event); } @@ -753,11 +1205,10 @@ ctlpeerstatus( #ifdef REFCLOCK static u_short ctlclkstatus( - struct refclockstat *this_clock + struct refclockstat *pcs ) { - return ((u_short)(((this_clock->currentstatus) << 8) | - (this_clock->lastevent))); + return CTL_PEER_STATUS(0, pcs->lastevent, pcs->currentstatus); } #endif @@ -772,22 +1223,18 @@ ctlsysstatus(void) this_clock = CTL_SST_TS_UNSPEC; #ifdef REFCLOCK - if (sys_peer != 0) { - if (sys_peer->sstclktype != CTL_SST_TS_UNSPEC) { + if (sys_peer != NULL) { + if (CTL_SST_TS_UNSPEC != sys_peer->sstclktype) this_clock = sys_peer->sstclktype; - if (pps_control) - this_clock |= CTL_SST_TS_PPS; - } else { - if (sys_peer->refclktype < sizeof(clocktypes)) - this_clock = - clocktypes[sys_peer->refclktype]; - if (pps_control) - this_clock |= CTL_SST_TS_PPS; - } + else if (sys_peer->refclktype < COUNTOF(clocktypes)) + this_clock = clocktypes[sys_peer->refclktype]; } +#else /* REFCLOCK */ + if (sys_peer != 0) + this_clock = CTL_SST_TS_NTP; #endif /* REFCLOCK */ - return (u_short)CTL_SYS_STATUS(sys_leap, this_clock, - ctl_sys_num_events, ctl_sys_last_event); + return CTL_SYS_STATUS(sys_leap, this_clock, ctl_sys_num_events, + ctl_sys_last_event); } @@ -797,20 +1244,25 @@ ctlsysstatus(void) */ static void ctl_flushpkt( - int more + u_char more ) { + size_t i; int dlen; int sendlen; + int maclen; + int totlen; + keyid_t keyid; - if (!more && datanotbinflag) { + dlen = datapt - rpkt.u.data; + if (!more && datanotbinflag && dlen + 2 < CTL_MAX_DATA_LEN) { /* * Big hack, output a trailing \r\n */ *datapt++ = '\r'; *datapt++ = '\n'; + dlen += 2; } - dlen = datapt - (u_char *)rpkt.data; sendlen = dlen + CTL_HEADER_LEN; /* @@ -824,35 +1276,31 @@ ctl_flushpkt( /* * Fill in the packet with the current info */ - rpkt.r_m_e_op = (u_char)(CTL_RESPONSE|more|(res_opcode & - CTL_OP_MASK)); - rpkt.count = htons((u_short) dlen); - rpkt.offset = htons( (u_short) res_offset); + rpkt.r_m_e_op = CTL_RESPONSE | more | + (res_opcode & CTL_OP_MASK); + rpkt.count = htons((u_short)dlen); + rpkt.offset = htons((u_short)res_offset); if (res_async) { - register int i; - - for (i = 0; i < CTL_MAXTRAPS; i++) { - if (ctl_trap[i].tr_flags & TRAP_INUSE) { + for (i = 0; i < COUNTOF(ctl_traps); i++) { + if (TRAP_INUSE & ctl_traps[i].tr_flags) { rpkt.li_vn_mode = - PKT_LI_VN_MODE(sys_leap, - ctl_trap[i].tr_version, - MODE_CONTROL); + PKT_LI_VN_MODE( + sys_leap, + ctl_traps[i].tr_version, + MODE_CONTROL); rpkt.sequence = - htons(ctl_trap[i].tr_sequence); - sendpkt(&ctl_trap[i].tr_addr, - ctl_trap[i].tr_localaddr, -4, + htons(ctl_traps[i].tr_sequence); + sendpkt(&ctl_traps[i].tr_addr, + ctl_traps[i].tr_localaddr, -4, (struct pkt *)&rpkt, sendlen); if (!more) - ctl_trap[i].tr_sequence++; + ctl_traps[i].tr_sequence++; numasyncmsgs++; } } } else { if (res_authenticate && sys_authenticate) { - int maclen; - int totlen = sendlen; - keyid_t keyid = htonl(res_keyid); - + totlen = sendlen; /* * If we are going to authenticate, then there * is an additional requirement that the MAC @@ -862,14 +1310,15 @@ ctl_flushpkt( *datapt++ = '\0'; totlen++; } - memcpy(datapt, &keyid, sizeof keyid); + keyid = htonl(res_keyid); + memcpy(datapt, &keyid, sizeof(keyid)); maclen = authencrypt(res_keyid, - (u_int32 *)&rpkt, totlen); + (u_int32 *)&rpkt, totlen); sendpkt(rmt_addr, lcl_inter, -5, - (struct pkt *)&rpkt, totlen + maclen); + (struct pkt *)&rpkt, totlen + maclen); } else { sendpkt(rmt_addr, lcl_inter, -6, - (struct pkt *)&rpkt, sendlen); + (struct pkt *)&rpkt, sendlen); } if (more) numctlfrags++; @@ -880,8 +1329,9 @@ ctl_flushpkt( /* * Set us up for another go around. */ + res_frags++; res_offset += dlen; - datapt = (u_char *)rpkt.data; + datapt = rpkt.u.data; } @@ -893,7 +1343,7 @@ static void ctl_putdata( const char *dp, unsigned int dlen, - int bin /* set to 1 when data is binary */ + int bin /* set to 1 when data is binary */ ) { int overhead; @@ -901,13 +1351,12 @@ ctl_putdata( overhead = 0; if (!bin) { - datanotbinflag = 1; + datanotbinflag = TRUE; overhead = 3; - if (datapt != rpkt.data) { + if (datasent) { *datapt++ = ','; datalinelen++; - if ((dlen + datalinelen + 1) >= MAXDATALINELEN) - { + if ((dlen + datalinelen + 1) >= MAXDATALINELEN) { *datapt++ = '\r'; *datapt++ = '\n'; datalinelen = 0; @@ -925,7 +1374,7 @@ ctl_putdata( /* * Not enough room in this one, flush it out. */ - currentlen = MIN(dlen, dataend - datapt); + currentlen = MIN(dlen, (unsigned int)(dataend - datapt)); memcpy(datapt, dp, currentlen); @@ -937,54 +1386,94 @@ ctl_putdata( ctl_flushpkt(CTL_MORE); } - memmove((char *)datapt, dp, (unsigned)dlen); + memcpy(datapt, dp, dlen); datapt += dlen; datalinelen += dlen; + datasent = TRUE; } /* * ctl_putstr - write a tagged string into the response packet + * in the form: + * + * tag="data" + * + * len is the data length excluding the NUL terminator, + * as in ctl_putstr("var", "value", strlen("value")); */ static void ctl_putstr( - const char *tag, - const char *data, - unsigned int len + const char * tag, + const char * data, + size_t len ) { - register char *cp; - register const char *cq; - char buffer[400]; + char buffer[512]; + char *cp; + size_t tl; - cp = buffer; - cq = tag; - while (*cq != '\0') - *cp++ = *cq++; + tl = strlen(tag); + memcpy(buffer, tag, tl); + cp = buffer + tl; if (len > 0) { + INSIST(tl + 3 + len <= sizeof(buffer)); *cp++ = '='; *cp++ = '"'; - if (len > (int) (sizeof(buffer) - (cp - buffer) - 1)) - len = sizeof(buffer) - (cp - buffer) - 1; - memmove(cp, data, (unsigned)len); + memcpy(cp, data, len); cp += len; *cp++ = '"'; } - ctl_putdata(buffer, (unsigned)( cp - buffer ), 0); + ctl_putdata(buffer, (u_int)(cp - buffer), 0); } /* - * ctl_putdbl - write a tagged, signed double into the response packet + * ctl_putunqstr - write a tagged string into the response packet + * in the form: + * + * tag=data + * + * len is the data length excluding the NUL terminator. + * data must not contain a comma or whitespace. */ static void -ctl_putdbl( - const char *tag, - double ts +ctl_putunqstr( + const char * tag, + const char * data, + size_t len ) { - register char *cp; - register const char *cq; + char buffer[512]; + char *cp; + size_t tl; + + tl = strlen(tag); + memcpy(buffer, tag, tl); + cp = buffer + tl; + if (len > 0) { + INSIST(tl + 1 + len <= sizeof(buffer)); + *cp++ = '='; + memcpy(cp, data, len); + cp += len; + } + ctl_putdata(buffer, (u_int)(cp - buffer), 0); +} + + +/* + * ctl_putdblf - write a tagged, signed double into the response packet + */ +static void +ctl_putdblf( + const char * tag, + int use_f, + int precision, + double d + ) +{ + char *cp; + const char *cq; char buffer[200]; cp = buffer; @@ -992,10 +1481,11 @@ ctl_putdbl( while (*cq != '\0') *cp++ = *cq++; *cp++ = '='; - (void)sprintf(cp, "%.3f", ts); - while (*cp != '\0') - cp++; - ctl_putdata(buffer, (unsigned)( cp - buffer ), 0); + INSIST((size_t)(cp - buffer) < sizeof(buffer)); + snprintf(cp, sizeof(buffer) - (cp - buffer), use_f ? "%.*f" : "%.*g", + precision, d); + cp += strlen(cp); + ctl_putdata(buffer, (unsigned)(cp - buffer), 0); } /* @@ -1017,16 +1507,42 @@ ctl_putuint( *cp++ = *cq++; *cp++ = '='; - (void) sprintf(cp, "%lu", uval); - while (*cp != '\0') - cp++; + INSIST((cp - buffer) < (int)sizeof(buffer)); + snprintf(cp, sizeof(buffer) - (cp - buffer), "%lu", uval); + cp += strlen(cp); ctl_putdata(buffer, (unsigned)( cp - buffer ), 0); } /* + * ctl_putcal - write a decoded calendar data into the response + */ +static void +ctl_putcal( + const char *tag, + const struct calendar *pcal + ) +{ + char buffer[100]; + unsigned numch; + + numch = snprintf(buffer, sizeof(buffer), + "%s=%04d%02d%02d%02d%02d", + tag, + pcal->year, + pcal->month, + pcal->monthday, + pcal->hour, + pcal->minute + ); + INSIST(numch < sizeof(buffer)); + ctl_putdata(buffer, numch, 0); + + return; +} + +/* * ctl_putfs - write a decoded filestamp into the response */ -#ifdef OPENSSL static void ctl_putfs( const char *tag, @@ -1047,20 +1563,20 @@ ctl_putfs( *cp++ = '='; fstamp = uval - JAN_1970; tm = gmtime(&fstamp); - if (tm == NULL) + if (NULL == tm) return; - - sprintf(cp, "%04d%02d%02d%02d%02d", tm->tm_year + 1900, - tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min); - while (*cp != '\0') - cp++; + INSIST((cp - buffer) < (int)sizeof(buffer)); + snprintf(cp, sizeof(buffer) - (cp - buffer), + "%04d%02d%02d%02d%02d", tm->tm_year + 1900, + tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min); + cp += strlen(cp); ctl_putdata(buffer, (unsigned)( cp - buffer ), 0); } -#endif /* - * ctl_puthex - write a tagged unsigned integer, in hex, into the response + * ctl_puthex - write a tagged unsigned integer, in hex, into the + * response */ static void ctl_puthex( @@ -1078,9 +1594,9 @@ ctl_puthex( *cp++ = *cq++; *cp++ = '='; - (void) sprintf(cp, "0x%lx", uval); - while (*cp != '\0') - cp++; + INSIST((cp - buffer) < (int)sizeof(buffer)); + snprintf(cp, sizeof(buffer) - (cp - buffer), "0x%lx", uval); + cp += strlen(cp); ctl_putdata(buffer,(unsigned)( cp - buffer ), 0); } @@ -1104,9 +1620,9 @@ ctl_putint( *cp++ = *cq++; *cp++ = '='; - (void) sprintf(cp, "%ld", ival); - while (*cp != '\0') - cp++; + INSIST((cp - buffer) < (int)sizeof(buffer)); + snprintf(cp, sizeof(buffer) - (cp - buffer), "%ld", ival); + cp += strlen(cp); ctl_putdata(buffer, (unsigned)( cp - buffer ), 0); } @@ -1130,11 +1646,10 @@ ctl_putts( *cp++ = *cq++; *cp++ = '='; - (void) sprintf(cp, "0x%08lx.%08lx", - ts->l_ui & ULONG_CONST(0xffffffff), - ts->l_uf & ULONG_CONST(0xffffffff)); - while (*cp != '\0') - cp++; + INSIST((size_t)(cp - buffer) < sizeof(buffer)); + snprintf(cp, sizeof(buffer) - (cp - buffer), "0x%08x.%08x", + (u_int)ts->l_ui, (u_int)ts->l_uf); + cp += strlen(cp); ctl_putdata(buffer, (unsigned)( cp - buffer ), 0); } @@ -1146,7 +1661,7 @@ static void ctl_putadr( const char *tag, u_int32 addr32, - struct sockaddr_storage* addr + sockaddr_u *addr ) { register char *cp; @@ -1159,38 +1674,54 @@ ctl_putadr( *cp++ = *cq++; *cp++ = '='; - if (addr == NULL) + if (NULL == addr) cq = numtoa(addr32); else cq = stoa(addr); - while (*cq != '\0') - *cp++ = *cq++; - ctl_putdata(buffer, (unsigned)( cp - buffer ), 0); + INSIST((cp - buffer) < (int)sizeof(buffer)); + snprintf(cp, sizeof(buffer) - (cp - buffer), "%s", cq); + cp += strlen(cp); + ctl_putdata(buffer, (unsigned)(cp - buffer), 0); } + /* - * ctl_putid - write a tagged clock ID into the response + * ctl_putrefid - send a u_int32 refid as printable text */ static void -ctl_putid( - const char *tag, - char *id +ctl_putrefid( + const char * tag, + u_int32 refid ) { - register char *cp; - register const char *cq; - char buffer[200]; - - cp = buffer; - cq = tag; - while (*cq != '\0') - *cp++ = *cq++; - - *cp++ = '='; - cq = id; - while (*cq != '\0' && (cq - id) < 4) - *cp++ = *cq++; - ctl_putdata(buffer, (unsigned)( cp - buffer ), 0); + char output[16]; + char * optr; + char * oplim; + char * iptr; + char * iplim; + char * past_eq; + + optr = output; + oplim = output + sizeof(output); + while (optr < oplim && '\0' != *tag) + *optr++ = *tag++; + if (optr < oplim) { + *optr++ = '='; + past_eq = optr; + } + if (!(optr < oplim)) + return; + iptr = (char *)&refid; + iplim = iptr + sizeof(refid); + for ( ; optr < oplim && iptr < iplim && '\0' != *iptr; + iptr++, optr++) + if (isprint((int)*iptr)) + *optr = *iptr; + else + *optr = '.'; + if (!(optr <= oplim)) + optr = past_eq; + ctl_putdata(output, (u_int)(optr - output), FALSE); } @@ -1212,15 +1743,17 @@ ctl_putarray( cq = tag; while (*cq != '\0') *cp++ = *cq++; + *cp++ = '='; i = start; do { if (i == 0) i = NTP_SHIFT; i--; - (void)sprintf(cp, " %.2f", arr[i] * 1e3); - while (*cp != '\0') - cp++; - } while(i != start); + INSIST((cp - buffer) < (int)sizeof(buffer)); + snprintf(cp, sizeof(buffer) - (cp - buffer), + " %.2f", arr[i] * 1e3); + cp += strlen(cp); + } while (i != start); ctl_putdata(buffer, (unsigned)(cp - buffer), 0); } @@ -1235,10 +1768,36 @@ ctl_putsys( { l_fp tmp; char str[256]; -#ifdef OPENSSL + u_int u; + double kb; + double dtemp; + const char *ss; +#ifdef AUTOKEY struct cert_info *cp; - char cbuf[256]; -#endif /* OPENSSL */ +#endif /* AUTOKEY */ +#ifdef KERNEL_PLL + static struct timex ntx; + static u_long ntp_adjtime_time; + + static const double to_ms = +# ifdef STA_NANO + 1.0e-6; /* nsec to msec */ +# else + 1.0e-3; /* usec to msec */ +# endif + + /* + * CS_K_* variables depend on up-to-date output of ntp_adjtime() + */ + if (CS_KERN_FIRST <= varid && varid <= CS_KERN_LAST && + current_time != ntp_adjtime_time) { + ZERO(ntx); + if (ntp_adjtime(&ntx) < 0) + msyslog(LOG_ERR, "ntp_adjtime() for mode 6 query failed: %m"); + else + ntp_adjtime_time = current_time; + } +#endif /* KERNEL_PLL */ switch (varid) { @@ -1256,20 +1815,19 @@ ctl_putsys( case CS_ROOTDELAY: ctl_putdbl(sys_var[CS_ROOTDELAY].text, sys_rootdelay * - 1e3); + 1e3); break; case CS_ROOTDISPERSION: ctl_putdbl(sys_var[CS_ROOTDISPERSION].text, - sys_rootdispersion * 1e3); + sys_rootdisp * 1e3); break; case CS_REFID: if (sys_stratum > 1 && sys_stratum < STRATUM_UNSPEC) - ctl_putadr(sys_var[CS_REFID].text, sys_refid, NULL); + ctl_putadr(sys_var[varid].text, sys_refid, NULL); else - ctl_putid(sys_var[CS_REFID].text, - (char *)&sys_refid); + ctl_putrefid(sys_var[varid].text, sys_refid); break; case CS_REFTIME: @@ -1285,15 +1843,26 @@ ctl_putsys( ctl_putuint(sys_var[CS_PEERID].text, 0); else ctl_putuint(sys_var[CS_PEERID].text, - sys_peer->associd); + sys_peer->associd); break; - case CS_STATE: - ctl_putuint(sys_var[CS_STATE].text, (unsigned)state); + case CS_PEERADR: + if (sys_peer != NULL && sys_peer->dstadr != NULL) + ss = sptoa(&sys_peer->srcadr); + else + ss = "0.0.0.0:0"; + ctl_putunqstr(sys_var[CS_PEERADR].text, ss, strlen(ss)); + break; + + case CS_PEERMODE: + u = (sys_peer != NULL) + ? sys_peer->hmode + : MODE_UNSPEC; + ctl_putuint(sys_var[CS_PEERMODE].text, u); break; case CS_OFFSET: - ctl_putdbl(sys_var[CS_OFFSET].text, last_offset * 1e3); + ctl_putdbl6(sys_var[CS_OFFSET].text, last_offset * 1e3); break; case CS_DRIFT: @@ -1301,7 +1870,7 @@ ctl_putsys( break; case CS_JITTER: - ctl_putdbl(sys_var[CS_JITTER].text, sys_jitter * 1e3); + ctl_putdbl6(sys_var[CS_JITTER].text, sys_jitter * 1e3); break; case CS_ERROR: @@ -1316,164 +1885,542 @@ ctl_putsys( case CS_PROCESSOR: #ifndef HAVE_UNAME ctl_putstr(sys_var[CS_PROCESSOR].text, str_processor, - sizeof(str_processor) - 1); + sizeof(str_processor) - 1); #else ctl_putstr(sys_var[CS_PROCESSOR].text, - utsnamebuf.machine, strlen(utsnamebuf.machine)); + utsnamebuf.machine, strlen(utsnamebuf.machine)); #endif /* HAVE_UNAME */ break; case CS_SYSTEM: #ifndef HAVE_UNAME ctl_putstr(sys_var[CS_SYSTEM].text, str_system, - sizeof(str_system) - 1); + sizeof(str_system) - 1); #else - sprintf(str, "%s/%s", utsnamebuf.sysname, utsnamebuf.release); + snprintf(str, sizeof(str), "%s/%s", utsnamebuf.sysname, + utsnamebuf.release); ctl_putstr(sys_var[CS_SYSTEM].text, str, strlen(str)); #endif /* HAVE_UNAME */ break; case CS_VERSION: ctl_putstr(sys_var[CS_VERSION].text, Version, - strlen(Version)); + strlen(Version)); break; case CS_STABIL: ctl_putdbl(sys_var[CS_STABIL].text, clock_stability * - 1e6); + 1e6); break; case CS_VARLIST: - { - char buf[CTL_MAX_DATA_LEN]; - register char *s, *t, *be; - register const char *ss; - register int i; - register struct ctl_var *k; - - s = buf; - be = buf + sizeof(buf) - - strlen(sys_var[CS_VARLIST].text) - 4; - if (s > be) - break; /* really long var name */ - - strcpy(s, sys_var[CS_VARLIST].text); - strcat(s, "=\""); - s += strlen(s); - t = s; - for (k = sys_var; !(k->flags &EOV); k++) { - if (k->flags & PADDING) - continue; - i = strlen(k->text); - if (s+i+1 >= be) + { + char buf[CTL_MAX_DATA_LEN]; + //buffPointer, firstElementPointer, buffEndPointer + char *buffp, *buffend; + int firstVarName; + const char *ss1; + int len; + const struct ctl_var *k; + + buffp = buf; + buffend = buf + sizeof(buf); + if (buffp + strlen(sys_var[CS_VARLIST].text) + 4 > buffend) + break; /* really long var name */ + + snprintf(buffp, sizeof(buf), "%s=\"",sys_var[CS_VARLIST].text); + buffp += strlen(buffp); + firstVarName = TRUE; + for (k = sys_var; !(k->flags & EOV); k++) { + if (k->flags & PADDING) + continue; + len = strlen(k->text); + if (buffp + len + 1 >= buffend) break; + if (!firstVarName) + *buffp++ = ','; + else + firstVarName = FALSE; + memcpy(buffp, k->text, len); + buffp += len; + } - if (s != t) - *s++ = ','; - strcpy(s, k->text); - s += i; + for (k = ext_sys_var; k && !(k->flags & EOV); k++) { + if (k->flags & PADDING) + continue; + if (NULL == k->text) + continue; + ss1 = strchr(k->text, '='); + if (NULL == ss1) + len = strlen(k->text); + else + len = ss1 - k->text; + if (buffp + len + 1 >= buffend) + break; + if (firstVarName) { + *buffp++ = ','; + firstVarName = FALSE; } + memcpy(buffp, k->text,(unsigned)len); + buffp += len; + } + if (buffp + 2 >= buffend) + break; - for (k = ext_sys_var; k && !(k->flags &EOV); - k++) { - if (k->flags & PADDING) - continue; + *buffp++ = '"'; + *buffp = '\0'; - ss = k->text; - if (!ss) - continue; + ctl_putdata(buf, (unsigned)( buffp - buf ), 0); + break; + } - while (*ss && *ss != '=') - ss++; - i = ss - k->text; - if (s + i + 1 >= be) - break; + case CS_TAI: + if (sys_tai > 0) + ctl_putuint(sys_var[CS_TAI].text, sys_tai); + break; - if (s != t) - *s++ = ','; - strncpy(s, k->text, - (unsigned)i); - s += i; - } - if (s+2 >= be) - break; + case CS_LEAPTAB: + { + leap_signature_t lsig; + leapsec_getsig(&lsig); + if (lsig.ttime > 0) + ctl_putfs(sys_var[CS_LEAPTAB].text, lsig.ttime); + break; + } - *s++ = '"'; - *s = '\0'; + case CS_LEAPEND: + { + leap_signature_t lsig; + leapsec_getsig(&lsig); + if (lsig.etime > 0) + ctl_putfs(sys_var[CS_LEAPEND].text, lsig.etime); + break; + } - ctl_putdata(buf, (unsigned)( s - buf ), - 0); - } +#ifdef LEAP_SMEAR + case CS_LEAPSMEARINTV: + if (leap_smear_intv > 0) + ctl_putuint(sys_var[CS_LEAPSMEARINTV].text, leap_smear_intv); + break; + + case CS_LEAPSMEAROFFS: + if (leap_smear_intv > 0) + ctl_putdbl(sys_var[CS_LEAPSMEAROFFS].text, + leap_smear.doffset * 1e3); + break; +#endif /* LEAP_SMEAR */ + + case CS_RATE: + ctl_putuint(sys_var[CS_RATE].text, ntp_minpoll); + break; + + case CS_MRU_ENABLED: + ctl_puthex(sys_var[varid].text, mon_enabled); + break; + + case CS_MRU_DEPTH: + ctl_putuint(sys_var[varid].text, mru_entries); + break; + + case CS_MRU_MEM: + kb = mru_entries * (sizeof(mon_entry) / 1024.); + u = (u_int)kb; + if (kb - u >= 0.5) + u++; + ctl_putuint(sys_var[varid].text, u); + break; + + case CS_MRU_DEEPEST: + ctl_putuint(sys_var[varid].text, mru_peakentries); + break; + + case CS_MRU_MINDEPTH: + ctl_putuint(sys_var[varid].text, mru_mindepth); + break; + + case CS_MRU_MAXAGE: + ctl_putint(sys_var[varid].text, mru_maxage); + break; + + case CS_MRU_MAXDEPTH: + ctl_putuint(sys_var[varid].text, mru_maxdepth); + break; + + case CS_MRU_MAXMEM: + kb = mru_maxdepth * (sizeof(mon_entry) / 1024.); + u = (u_int)kb; + if (kb - u >= 0.5) + u++; + ctl_putuint(sys_var[varid].text, u); + break; + + case CS_SS_UPTIME: + ctl_putuint(sys_var[varid].text, current_time); + break; + + case CS_SS_RESET: + ctl_putuint(sys_var[varid].text, + current_time - sys_stattime); + break; + + case CS_SS_RECEIVED: + ctl_putuint(sys_var[varid].text, sys_received); + break; + + case CS_SS_THISVER: + ctl_putuint(sys_var[varid].text, sys_newversion); + break; + + case CS_SS_OLDVER: + ctl_putuint(sys_var[varid].text, sys_oldversion); + break; + + case CS_SS_BADFORMAT: + ctl_putuint(sys_var[varid].text, sys_badlength); + break; + + case CS_SS_BADAUTH: + ctl_putuint(sys_var[varid].text, sys_badauth); + break; + + case CS_SS_DECLINED: + ctl_putuint(sys_var[varid].text, sys_declined); + break; + + case CS_SS_RESTRICTED: + ctl_putuint(sys_var[varid].text, sys_restricted); + break; + + case CS_SS_LIMITED: + ctl_putuint(sys_var[varid].text, sys_limitrejected); + break; + + case CS_SS_KODSENT: + ctl_putuint(sys_var[varid].text, sys_kodsent); + break; + + case CS_SS_PROCESSED: + ctl_putuint(sys_var[varid].text, sys_processed); + break; + + case CS_BCASTDELAY: + ctl_putdbl(sys_var[varid].text, sys_bdelay * 1e3); + break; + + case CS_AUTHDELAY: + LFPTOD(&sys_authdelay, dtemp); + ctl_putdbl(sys_var[varid].text, dtemp * 1e3); + break; + + case CS_AUTHKEYS: + ctl_putuint(sys_var[varid].text, authnumkeys); + break; + + case CS_AUTHFREEK: + ctl_putuint(sys_var[varid].text, authnumfreekeys); + break; + + case CS_AUTHKLOOKUPS: + ctl_putuint(sys_var[varid].text, authkeylookups); + break; + + case CS_AUTHKNOTFOUND: + ctl_putuint(sys_var[varid].text, authkeynotfound); + break; + + case CS_AUTHKUNCACHED: + ctl_putuint(sys_var[varid].text, authkeyuncached); + break; + + case CS_AUTHKEXPIRED: + ctl_putuint(sys_var[varid].text, authkeyexpired); + break; + + case CS_AUTHENCRYPTS: + ctl_putuint(sys_var[varid].text, authencryptions); + break; + + case CS_AUTHDECRYPTS: + ctl_putuint(sys_var[varid].text, authdecryptions); + break; + + case CS_AUTHRESET: + ctl_putuint(sys_var[varid].text, + current_time - auth_timereset); + break; + + /* + * CTL_IF_KERNLOOP() puts a zero if the kernel loop is + * unavailable, otherwise calls putfunc with args. + */ +#ifndef KERNEL_PLL +# define CTL_IF_KERNLOOP(putfunc, args) \ + ctl_putint(sys_var[varid].text, 0) +#else +# define CTL_IF_KERNLOOP(putfunc, args) \ + putfunc args +#endif + + /* + * CTL_IF_KERNPPS() puts a zero if either the kernel + * loop is unavailable, or kernel hard PPS is not + * active, otherwise calls putfunc with args. + */ +#ifndef KERNEL_PLL +# define CTL_IF_KERNPPS(putfunc, args) \ + ctl_putint(sys_var[varid].text, 0) +#else +# define CTL_IF_KERNPPS(putfunc, args) \ + if (0 == ntx.shift) \ + ctl_putint(sys_var[varid].text, 0); \ + else \ + putfunc args /* no trailing ; */ +#endif + + case CS_K_OFFSET: + CTL_IF_KERNLOOP( + ctl_putdblf, + (sys_var[varid].text, 0, -1, to_ms * ntx.offset) + ); + break; + + case CS_K_FREQ: + CTL_IF_KERNLOOP( + ctl_putsfp, + (sys_var[varid].text, ntx.freq) + ); + break; + + case CS_K_MAXERR: + CTL_IF_KERNLOOP( + ctl_putdblf, + (sys_var[varid].text, 0, 6, + to_ms * ntx.maxerror) + ); + break; + + case CS_K_ESTERR: + CTL_IF_KERNLOOP( + ctl_putdblf, + (sys_var[varid].text, 0, 6, + to_ms * ntx.esterror) + ); + break; + + case CS_K_STFLAGS: +#ifndef KERNEL_PLL + ss = ""; +#else + ss = k_st_flags(ntx.status); +#endif + ctl_putstr(sys_var[varid].text, ss, strlen(ss)); + break; + + case CS_K_TIMECONST: + CTL_IF_KERNLOOP( + ctl_putint, + (sys_var[varid].text, ntx.constant) + ); + break; + + case CS_K_PRECISION: + CTL_IF_KERNLOOP( + ctl_putdblf, + (sys_var[varid].text, 0, 6, + to_ms * ntx.precision) + ); + break; + + case CS_K_FREQTOL: + CTL_IF_KERNLOOP( + ctl_putsfp, + (sys_var[varid].text, ntx.tolerance) + ); + break; + + case CS_K_PPS_FREQ: + CTL_IF_KERNPPS( + ctl_putsfp, + (sys_var[varid].text, ntx.ppsfreq) + ); + break; + + case CS_K_PPS_STABIL: + CTL_IF_KERNPPS( + ctl_putsfp, + (sys_var[varid].text, ntx.stabil) + ); + break; + + case CS_K_PPS_JITTER: + CTL_IF_KERNPPS( + ctl_putdbl, + (sys_var[varid].text, to_ms * ntx.jitter) + ); + break; + + case CS_K_PPS_CALIBDUR: + CTL_IF_KERNPPS( + ctl_putint, + (sys_var[varid].text, 1 << ntx.shift) + ); + break; + + case CS_K_PPS_CALIBS: + CTL_IF_KERNPPS( + ctl_putint, + (sys_var[varid].text, ntx.calcnt) + ); + break; + + case CS_K_PPS_CALIBERRS: + CTL_IF_KERNPPS( + ctl_putint, + (sys_var[varid].text, ntx.errcnt) + ); + break; + + case CS_K_PPS_JITEXC: + CTL_IF_KERNPPS( + ctl_putint, + (sys_var[varid].text, ntx.jitcnt) + ); + break; + + case CS_K_PPS_STBEXC: + CTL_IF_KERNPPS( + ctl_putint, + (sys_var[varid].text, ntx.stbcnt) + ); + break; + + case CS_IOSTATS_RESET: + ctl_putuint(sys_var[varid].text, + current_time - io_timereset); + break; + + case CS_TOTAL_RBUF: + ctl_putuint(sys_var[varid].text, total_recvbuffs()); + break; + + case CS_FREE_RBUF: + ctl_putuint(sys_var[varid].text, free_recvbuffs()); + break; + + case CS_USED_RBUF: + ctl_putuint(sys_var[varid].text, full_recvbuffs()); + break; + + case CS_RBUF_LOWATER: + ctl_putuint(sys_var[varid].text, lowater_additions()); + break; + + case CS_IO_DROPPED: + ctl_putuint(sys_var[varid].text, packets_dropped); + break; + + case CS_IO_IGNORED: + ctl_putuint(sys_var[varid].text, packets_ignored); + break; + + case CS_IO_RECEIVED: + ctl_putuint(sys_var[varid].text, packets_received); + break; + + case CS_IO_SENT: + ctl_putuint(sys_var[varid].text, packets_sent); + break; + + case CS_IO_SENDFAILED: + ctl_putuint(sys_var[varid].text, packets_notsent); + break; + + case CS_IO_WAKEUPS: + ctl_putuint(sys_var[varid].text, handler_calls); + break; + + case CS_IO_GOODWAKEUPS: + ctl_putuint(sys_var[varid].text, handler_pkts); + break; + + case CS_TIMERSTATS_RESET: + ctl_putuint(sys_var[varid].text, + current_time - timer_timereset); break; -#ifdef OPENSSL + case CS_TIMER_OVERRUNS: + ctl_putuint(sys_var[varid].text, alarm_overflow); + break; + + case CS_TIMER_XMTS: + ctl_putuint(sys_var[varid].text, timer_xmtcalls); + break; + + case CS_FUZZ: + ctl_putdbl(sys_var[varid].text, sys_fuzz * 1e3); + break; + case CS_WANDER_THRESH: + ctl_putdbl(sys_var[varid].text, wander_threshold * 1e6); + break; +#ifdef AUTOKEY case CS_FLAGS: + if (crypto_flags) + ctl_puthex(sys_var[CS_FLAGS].text, + crypto_flags); + break; + + case CS_DIGEST: if (crypto_flags) { - ctl_puthex(sys_var[CS_FLAGS].text, crypto_flags); + strlcpy(str, OBJ_nid2ln(crypto_nid), + COUNTOF(str)); + ctl_putstr(sys_var[CS_DIGEST].text, str, + strlen(str)); } break; - case CS_DIGEST: + case CS_SIGNATURE: if (crypto_flags) { const EVP_MD *dp; dp = EVP_get_digestbynid(crypto_flags >> 16); - strcpy(str, OBJ_nid2ln(EVP_MD_pkey_type(dp))); - ctl_putstr(sys_var[CS_DIGEST].text, str, + strlcpy(str, OBJ_nid2ln(EVP_MD_pkey_type(dp)), + COUNTOF(str)); + ctl_putstr(sys_var[CS_SIGNATURE].text, str, strlen(str)); } break; case CS_HOST: - if (sys_hostname != NULL) - ctl_putstr(sys_var[CS_HOST].text, sys_hostname, - strlen(sys_hostname)); + if (hostval.ptr != NULL) + ctl_putstr(sys_var[CS_HOST].text, hostval.ptr, + strlen(hostval.ptr)); + break; + + case CS_IDENT: + if (sys_ident != NULL) + ctl_putstr(sys_var[CS_IDENT].text, sys_ident, + strlen(sys_ident)); break; case CS_CERTIF: for (cp = cinfo; cp != NULL; cp = cp->link) { - sprintf(cbuf, "%s %s 0x%x", cp->subject, - cp->issuer, cp->flags); - ctl_putstr(sys_var[CS_CERTIF].text, cbuf, - strlen(cbuf)); - ctl_putfs(sys_var[CS_REVOKE].text, cp->last); + snprintf(str, sizeof(str), "%s %s 0x%x", + cp->subject, cp->issuer, cp->flags); + ctl_putstr(sys_var[CS_CERTIF].text, str, + strlen(str)); + ctl_putcal(sys_var[CS_REVTIME].text, &(cp->last)); } break; case CS_PUBLIC: - if (hostval.fstamp != 0) - ctl_putfs(sys_var[CS_PUBLIC].text, - ntohl(hostval.tstamp)); - break; - - case CS_REVTIME: if (hostval.tstamp != 0) - ctl_putfs(sys_var[CS_REVTIME].text, + ctl_putfs(sys_var[CS_PUBLIC].text, ntohl(hostval.tstamp)); break; +#endif /* AUTOKEY */ - case CS_IDENT: - if (iffpar_pkey != NULL) - ctl_putstr(sys_var[CS_IDENT].text, - iffpar_file, strlen(iffpar_file)); - if (gqpar_pkey != NULL) - ctl_putstr(sys_var[CS_IDENT].text, - gqpar_file, strlen(gqpar_file)); - if (mvpar_pkey != NULL) - ctl_putstr(sys_var[CS_IDENT].text, - mvpar_file, strlen(mvpar_file)); - break; - - case CS_LEAPTAB: - if (tai_leap.fstamp != 0) - ctl_putfs(sys_var[CS_LEAPTAB].text, - ntohl(tai_leap.fstamp)); - break; - - case CS_TAI: - ctl_putuint(sys_var[CS_TAI].text, sys_tai); + default: break; -#endif /* OPENSSL */ } } @@ -1483,275 +2430,328 @@ ctl_putsys( */ static void ctl_putpeer( - int varid, - struct peer *peer + int id, + struct peer *p ) { - int temp; -#ifdef OPENSSL - char str[256]; + char buf[CTL_MAX_DATA_LEN]; + char *s; + char *t; + char *be; + int i; + const struct ctl_var *k; +#ifdef AUTOKEY struct autokey *ap; -#endif /* OPENSSL */ + const EVP_MD *dp; + const char *str; +#endif /* AUTOKEY */ - switch (varid) { + switch (id) { case CP_CONFIG: - ctl_putuint(peer_var[CP_CONFIG].text, - (unsigned)((peer->flags & FLAG_CONFIG) != 0)); + ctl_putuint(peer_var[id].text, + !(FLAG_PREEMPT & p->flags)); break; case CP_AUTHENABLE: - ctl_putuint(peer_var[CP_AUTHENABLE].text, - (unsigned)((peer->flags & FLAG_AUTHENABLE) != 0)); + ctl_putuint(peer_var[id].text, !(p->keyid)); break; case CP_AUTHENTIC: - ctl_putuint(peer_var[CP_AUTHENTIC].text, - (unsigned)((peer->flags & FLAG_AUTHENTIC) != 0)); + ctl_putuint(peer_var[id].text, + !!(FLAG_AUTHENTIC & p->flags)); break; case CP_SRCADR: - ctl_putadr(peer_var[CP_SRCADR].text, 0, - &peer->srcadr); + ctl_putadr(peer_var[id].text, 0, &p->srcadr); break; case CP_SRCPORT: - ctl_putuint(peer_var[CP_SRCPORT].text, - ntohs(((struct sockaddr_in*)&peer->srcadr)->sin_port)); + ctl_putuint(peer_var[id].text, SRCPORT(&p->srcadr)); + break; + + case CP_SRCHOST: + if (p->hostname != NULL) + ctl_putstr(peer_var[id].text, p->hostname, + strlen(p->hostname)); break; case CP_DSTADR: - if (peer->dstadr) { - ctl_putadr(peer_var[CP_DSTADR].text, 0, - &(peer->dstadr->sin)); - } else { - ctl_putadr(peer_var[CP_DSTADR].text, 0, - NULL); - } + ctl_putadr(peer_var[id].text, 0, + (p->dstadr != NULL) + ? &p->dstadr->sin + : NULL); break; case CP_DSTPORT: - ctl_putuint(peer_var[CP_DSTPORT].text, - (u_long)(peer->dstadr ? - ntohs(((struct sockaddr_in*)&peer->dstadr->sin)->sin_port) : 0)); + ctl_putuint(peer_var[id].text, + (p->dstadr != NULL) + ? SRCPORT(&p->dstadr->sin) + : 0); + break; + + case CP_IN: + if (p->r21 > 0.) + ctl_putdbl(peer_var[id].text, p->r21 / 1e3); + break; + + case CP_OUT: + if (p->r34 > 0.) + ctl_putdbl(peer_var[id].text, p->r34 / 1e3); + break; + + case CP_RATE: + ctl_putuint(peer_var[id].text, p->throttle); break; case CP_LEAP: - ctl_putuint(peer_var[CP_LEAP].text, peer->leap); + ctl_putuint(peer_var[id].text, p->leap); break; case CP_HMODE: - ctl_putuint(peer_var[CP_HMODE].text, peer->hmode); + ctl_putuint(peer_var[id].text, p->hmode); break; case CP_STRATUM: - ctl_putuint(peer_var[CP_STRATUM].text, peer->stratum); + ctl_putuint(peer_var[id].text, p->stratum); break; case CP_PPOLL: - ctl_putuint(peer_var[CP_PPOLL].text, peer->ppoll); + ctl_putuint(peer_var[id].text, p->ppoll); break; case CP_HPOLL: - ctl_putuint(peer_var[CP_HPOLL].text, peer->hpoll); + ctl_putuint(peer_var[id].text, p->hpoll); break; case CP_PRECISION: - ctl_putint(peer_var[CP_PRECISION].text, - peer->precision); + ctl_putint(peer_var[id].text, p->precision); break; case CP_ROOTDELAY: - ctl_putdbl(peer_var[CP_ROOTDELAY].text, - peer->rootdelay * 1e3); + ctl_putdbl(peer_var[id].text, p->rootdelay * 1e3); break; case CP_ROOTDISPERSION: - ctl_putdbl(peer_var[CP_ROOTDISPERSION].text, - peer->rootdispersion * 1e3); + ctl_putdbl(peer_var[id].text, p->rootdisp * 1e3); break; case CP_REFID: - if (peer->flags & FLAG_REFCLOCK) { - ctl_putid(peer_var[CP_REFID].text, - (char *)&peer->refid); - } else { - if (peer->stratum > 1 && peer->stratum < - STRATUM_UNSPEC) - ctl_putadr(peer_var[CP_REFID].text, - peer->refid, NULL); - else - ctl_putid(peer_var[CP_REFID].text, - (char *)&peer->refid); +#ifdef REFCLOCK + if (p->flags & FLAG_REFCLOCK) { + ctl_putrefid(peer_var[id].text, p->refid); + break; } +#endif + if (p->stratum > 1 && p->stratum < STRATUM_UNSPEC) + ctl_putadr(peer_var[id].text, p->refid, + NULL); + else + ctl_putrefid(peer_var[id].text, p->refid); break; case CP_REFTIME: - ctl_putts(peer_var[CP_REFTIME].text, &peer->reftime); + ctl_putts(peer_var[id].text, &p->reftime); break; case CP_ORG: - ctl_putts(peer_var[CP_ORG].text, &peer->org); + ctl_putts(peer_var[id].text, &p->aorg); break; case CP_REC: - ctl_putts(peer_var[CP_REC].text, &peer->rec); + ctl_putts(peer_var[id].text, &p->dst); break; case CP_XMT: - ctl_putts(peer_var[CP_XMT].text, &peer->xmt); + if (p->xleave) + ctl_putdbl(peer_var[id].text, p->xleave * 1e3); + break; + + case CP_BIAS: + if (p->bias != 0.) + ctl_putdbl(peer_var[id].text, p->bias * 1e3); break; case CP_REACH: - ctl_puthex(peer_var[CP_REACH].text, peer->reach); + ctl_puthex(peer_var[id].text, p->reach); break; case CP_FLASH: - temp = peer->flash; - ctl_puthex(peer_var[CP_FLASH].text, temp); + ctl_puthex(peer_var[id].text, p->flash); break; case CP_TTL: - ctl_putint(peer_var[CP_TTL].text, sys_ttl[peer->ttl]); +#ifdef REFCLOCK + if (p->flags & FLAG_REFCLOCK) { + ctl_putuint(peer_var[id].text, p->ttl); + break; + } +#endif + if (p->ttl > 0 && p->ttl < COUNTOF(sys_ttl)) + ctl_putint(peer_var[id].text, + sys_ttl[p->ttl]); break; case CP_UNREACH: - ctl_putuint(peer_var[CP_UNREACH].text, peer->unreach); + ctl_putuint(peer_var[id].text, p->unreach); break; case CP_TIMER: - ctl_putuint(peer_var[CP_TIMER].text, - peer->nextdate - current_time); + ctl_putuint(peer_var[id].text, + p->nextdate - current_time); break; case CP_DELAY: - ctl_putdbl(peer_var[CP_DELAY].text, peer->delay * 1e3); + ctl_putdbl(peer_var[id].text, p->delay * 1e3); break; case CP_OFFSET: - ctl_putdbl(peer_var[CP_OFFSET].text, peer->offset * - 1e3); + ctl_putdbl(peer_var[id].text, p->offset * 1e3); break; case CP_JITTER: - ctl_putdbl(peer_var[CP_JITTER].text, peer->jitter * 1e3); + ctl_putdbl(peer_var[id].text, p->jitter * 1e3); break; case CP_DISPERSION: - ctl_putdbl(peer_var[CP_DISPERSION].text, peer->disp * - 1e3); + ctl_putdbl(peer_var[id].text, p->disp * 1e3); break; case CP_KEYID: - ctl_putuint(peer_var[CP_KEYID].text, peer->keyid); + if (p->keyid > NTP_MAXKEY) + ctl_puthex(peer_var[id].text, p->keyid); + else + ctl_putuint(peer_var[id].text, p->keyid); break; case CP_FILTDELAY: - ctl_putarray(peer_var[CP_FILTDELAY].text, - peer->filter_delay, (int)peer->filter_nextpt); + ctl_putarray(peer_var[id].text, p->filter_delay, + p->filter_nextpt); break; case CP_FILTOFFSET: - ctl_putarray(peer_var[CP_FILTOFFSET].text, - peer->filter_offset, (int)peer->filter_nextpt); + ctl_putarray(peer_var[id].text, p->filter_offset, + p->filter_nextpt); break; case CP_FILTERROR: - ctl_putarray(peer_var[CP_FILTERROR].text, - peer->filter_disp, (int)peer->filter_nextpt); + ctl_putarray(peer_var[id].text, p->filter_disp, + p->filter_nextpt); break; case CP_PMODE: - ctl_putuint(peer_var[CP_PMODE].text, peer->pmode); + ctl_putuint(peer_var[id].text, p->pmode); break; case CP_RECEIVED: - ctl_putuint(peer_var[CP_RECEIVED].text, peer->received); + ctl_putuint(peer_var[id].text, p->received); break; case CP_SENT: - ctl_putuint(peer_var[CP_SENT].text, peer->sent); + ctl_putuint(peer_var[id].text, p->sent); break; case CP_VARLIST: - { - char buf[CTL_MAX_DATA_LEN]; - register char *s, *t, *be; - register int i; - register struct ctl_var *k; - - s = buf; - be = buf + sizeof(buf) - - strlen(peer_var[CP_VARLIST].text) - 4; - if (s > be) - break; /* really long var name */ - - strcpy(s, peer_var[CP_VARLIST].text); - strcat(s, "=\""); - s += strlen(s); - t = s; - for (k = peer_var; !(k->flags &EOV); k++) { - if (k->flags & PADDING) - continue; - - i = strlen(k->text); - if (s + i + 1 >= be) - break; - - if (s != t) - *s++ = ','; - strcpy(s, k->text); - s += i; - } - if (s+2 >= be) + s = buf; + be = buf + sizeof(buf); + if (strlen(peer_var[id].text) + 4 > sizeof(buf)) + break; /* really long var name */ + + snprintf(s, sizeof(buf), "%s=\"", peer_var[id].text); + s += strlen(s); + t = s; + for (k = peer_var; !(EOV & k->flags); k++) { + if (PADDING & k->flags) + continue; + i = strlen(k->text); + if (s + i + 1 >= be) break; - + if (s != t) + *s++ = ','; + memcpy(s, k->text, i); + s += i; + } + if (s + 2 < be) { *s++ = '"'; *s = '\0'; - ctl_putdata(buf, (unsigned)(s - buf), 0); + ctl_putdata(buf, (u_int)(s - buf), 0); } break; -#ifdef OPENSSL - case CP_FLAGS: - if (peer->crypto) - ctl_puthex(peer_var[CP_FLAGS].text, peer->crypto); + + case CP_TIMEREC: + ctl_putuint(peer_var[id].text, + current_time - p->timereceived); break; - case CP_DIGEST: - if (peer->crypto) { - const EVP_MD *dp; + case CP_TIMEREACH: + ctl_putuint(peer_var[id].text, + current_time - p->timereachable); + break; + + case CP_BADAUTH: + ctl_putuint(peer_var[id].text, p->badauth); + break; + + case CP_BOGUSORG: + ctl_putuint(peer_var[id].text, p->bogusorg); + break; + + case CP_OLDPKT: + ctl_putuint(peer_var[id].text, p->oldpkt); + break; + + case CP_SELDISP: + ctl_putuint(peer_var[id].text, p->seldisptoolarge); + break; + + case CP_SELBROKEN: + ctl_putuint(peer_var[id].text, p->selbroken); + break; - dp = EVP_get_digestbynid(peer->crypto >> 16); - strcpy(str, OBJ_nid2ln(EVP_MD_pkey_type(dp))); - ctl_putstr(peer_var[CP_DIGEST].text, str, - strlen(str)); + case CP_CANDIDATE: + ctl_putuint(peer_var[id].text, p->status); + break; +#ifdef AUTOKEY + case CP_FLAGS: + if (p->crypto) + ctl_puthex(peer_var[id].text, p->crypto); + break; + + case CP_SIGNATURE: + if (p->crypto) { + dp = EVP_get_digestbynid(p->crypto >> 16); + str = OBJ_nid2ln(EVP_MD_pkey_type(dp)); + ctl_putstr(peer_var[id].text, str, strlen(str)); } break; case CP_HOST: - if (peer->subject != NULL) - ctl_putstr(peer_var[CP_HOST].text, - peer->subject, strlen(peer->subject)); + if (p->subject != NULL) + ctl_putstr(peer_var[id].text, p->subject, + strlen(p->subject)); break; case CP_VALID: /* not used */ break; - case CP_IDENT: - if (peer->issuer != NULL) - ctl_putstr(peer_var[CP_IDENT].text, - peer->issuer, strlen(peer->issuer)); - break; - case CP_INITSEQ: - if ((ap = (struct autokey *)peer->recval.ptr) == NULL) + if (NULL == (ap = p->recval.ptr)) break; + ctl_putint(peer_var[CP_INITSEQ].text, ap->seq); ctl_puthex(peer_var[CP_INITKEY].text, ap->key); ctl_putfs(peer_var[CP_INITTSP].text, - ntohl(peer->recval.tstamp)); + ntohl(p->recval.tstamp)); break; -#endif /* OPENSSL */ + + case CP_IDENT: + if (p->ident != NULL) + ctl_putstr(peer_var[id].text, p->ident, + strlen(p->ident)); + break; + + +#endif /* AUTOKEY */ } } @@ -1762,153 +2762,148 @@ ctl_putpeer( */ static void ctl_putclock( - int varid, - struct refclockstat *clock_stat, + int id, + struct refclockstat *pcs, int mustput ) { - switch(varid) { + char buf[CTL_MAX_DATA_LEN]; + char *s, *t, *be; + const char *ss; + int i; + const struct ctl_var *k; + + switch (id) { case CC_TYPE: - if (mustput || clock_stat->clockdesc == NULL - || *(clock_stat->clockdesc) == '\0') { - ctl_putuint(clock_var[CC_TYPE].text, clock_stat->type); + if (mustput || pcs->clockdesc == NULL + || *(pcs->clockdesc) == '\0') { + ctl_putuint(clock_var[id].text, pcs->type); } break; case CC_TIMECODE: - ctl_putstr(clock_var[CC_TIMECODE].text, - clock_stat->p_lastcode, - (unsigned)clock_stat->lencode); + ctl_putstr(clock_var[id].text, + pcs->p_lastcode, + (unsigned)pcs->lencode); break; case CC_POLL: - ctl_putuint(clock_var[CC_POLL].text, clock_stat->polls); + ctl_putuint(clock_var[id].text, pcs->polls); break; case CC_NOREPLY: - ctl_putuint(clock_var[CC_NOREPLY].text, - clock_stat->noresponse); + ctl_putuint(clock_var[id].text, + pcs->noresponse); break; case CC_BADFORMAT: - ctl_putuint(clock_var[CC_BADFORMAT].text, - clock_stat->badformat); + ctl_putuint(clock_var[id].text, + pcs->badformat); break; case CC_BADDATA: - ctl_putuint(clock_var[CC_BADDATA].text, - clock_stat->baddata); + ctl_putuint(clock_var[id].text, + pcs->baddata); break; case CC_FUDGETIME1: - if (mustput || (clock_stat->haveflags & CLK_HAVETIME1)) - ctl_putdbl(clock_var[CC_FUDGETIME1].text, - clock_stat->fudgetime1 * 1e3); + if (mustput || (pcs->haveflags & CLK_HAVETIME1)) + ctl_putdbl(clock_var[id].text, + pcs->fudgetime1 * 1e3); break; case CC_FUDGETIME2: - if (mustput || (clock_stat->haveflags & CLK_HAVETIME2)) ctl_putdbl(clock_var[CC_FUDGETIME2].text, - clock_stat->fudgetime2 * 1e3); + if (mustput || (pcs->haveflags & CLK_HAVETIME2)) + ctl_putdbl(clock_var[id].text, + pcs->fudgetime2 * 1e3); break; case CC_FUDGEVAL1: - if (mustput || (clock_stat->haveflags & CLK_HAVEVAL1)) - ctl_putint(clock_var[CC_FUDGEVAL1].text, - clock_stat->fudgeval1); + if (mustput || (pcs->haveflags & CLK_HAVEVAL1)) + ctl_putint(clock_var[id].text, + pcs->fudgeval1); break; case CC_FUDGEVAL2: - if (mustput || (clock_stat->haveflags & CLK_HAVEVAL2)) { - if (clock_stat->fudgeval1 > 1) - ctl_putadr(clock_var[CC_FUDGEVAL2].text, - (u_int32)clock_stat->fudgeval2, NULL); + if (mustput || (pcs->haveflags & CLK_HAVEVAL2)) { + if (pcs->fudgeval1 > 1) + ctl_putadr(clock_var[id].text, + pcs->fudgeval2, NULL); else - ctl_putid(clock_var[CC_FUDGEVAL2].text, - (char *)&clock_stat->fudgeval2); + ctl_putrefid(clock_var[id].text, + pcs->fudgeval2); } break; case CC_FLAGS: - if (mustput || (clock_stat->haveflags & (CLK_HAVEFLAG1 | - CLK_HAVEFLAG2 | CLK_HAVEFLAG3 | CLK_HAVEFLAG4))) - ctl_putuint(clock_var[CC_FLAGS].text, - clock_stat->flags); + ctl_putuint(clock_var[id].text, pcs->flags); break; case CC_DEVICE: - if (clock_stat->clockdesc == NULL || - *(clock_stat->clockdesc) == '\0') { + if (pcs->clockdesc == NULL || + *(pcs->clockdesc) == '\0') { if (mustput) - ctl_putstr(clock_var[CC_DEVICE].text, - "", 0); + ctl_putstr(clock_var[id].text, + "", 0); } else { - ctl_putstr(clock_var[CC_DEVICE].text, - clock_stat->clockdesc, - strlen(clock_stat->clockdesc)); + ctl_putstr(clock_var[id].text, + pcs->clockdesc, + strlen(pcs->clockdesc)); } break; case CC_VARLIST: - { - char buf[CTL_MAX_DATA_LEN]; - register char *s, *t, *be; - register const char *ss; - register int i; - register struct ctl_var *k; - - s = buf; - be = buf + sizeof(buf); - if (s + strlen(clock_var[CC_VARLIST].text) + 4 > - be) - break; /* really long var name */ - - strcpy(s, clock_var[CC_VARLIST].text); - strcat(s, "=\""); - s += strlen(s); - t = s; - - for (k = clock_var; !(k->flags &EOV); k++) { - if (k->flags & PADDING) - continue; - - i = strlen(k->text); - if (s + i + 1 >= be) - break; + s = buf; + be = buf + sizeof(buf); + if (strlen(clock_var[CC_VARLIST].text) + 4 > + sizeof(buf)) + break; /* really long var name */ + + snprintf(s, sizeof(buf), "%s=\"", + clock_var[CC_VARLIST].text); + s += strlen(s); + t = s; + + for (k = clock_var; !(EOV & k->flags); k++) { + if (PADDING & k->flags) + continue; - if (s != t) - *s++ = ','; - strcpy(s, k->text); - s += i; - } + i = strlen(k->text); + if (s + i + 1 >= be) + break; - for (k = clock_stat->kv_list; k && !(k->flags & - EOV); k++) { - if (k->flags & PADDING) - continue; + if (s != t) + *s++ = ','; + memcpy(s, k->text, i); + s += i; + } - ss = k->text; - if (!ss) - continue; + for (k = pcs->kv_list; k && !(EOV & k->flags); k++) { + if (PADDING & k->flags) + continue; - while (*ss && *ss != '=') - ss++; - i = ss - k->text; - if (s+i+1 >= be) - break; + ss = k->text; + if (NULL == ss) + continue; - if (s != t) - *s++ = ','; - strncpy(s, k->text, (unsigned)i); - s += i; - *s = '\0'; - } - if (s+2 >= be) + while (*ss && *ss != '=') + ss++; + i = ss - k->text; + if (s + i + 1 >= be) break; - *s++ = '"'; + if (s != t) + *s++ = ','; + memcpy(s, k->text, (unsigned)i); + s += i; *s = '\0'; - ctl_putdata(buf, (unsigned)( s - buf ), 0); } + if (s + 2 >= be) + break; + + *s++ = '"'; + *s = '\0'; + ctl_putdata(buf, (unsigned)(s - buf), 0); break; } } @@ -1919,48 +2914,49 @@ ctl_putclock( /* * ctl_getitem - get the next data item from the incoming packet */ -static struct ctl_var * +static const struct ctl_var * ctl_getitem( - struct ctl_var *var_list, + const struct ctl_var *var_list, char **data ) { - register struct ctl_var *v; - register char *cp; - register char *tp; - static struct ctl_var eol = { 0, EOV, }; + static const struct ctl_var eol = { 0, EOV, NULL }; static char buf[128]; + static u_long quiet_until; + const struct ctl_var *v; + const char *pch; + char *cp; + char *tp; /* * Delete leading commas and white space */ while (reqpt < reqend && (*reqpt == ',' || - isspace((unsigned char)*reqpt))) + isspace((unsigned char)*reqpt))) reqpt++; if (reqpt >= reqend) - return (0); + return NULL; - if (var_list == (struct ctl_var *)0) - return (&eol); + if (NULL == var_list) + return &eol; /* * Look for a first character match on the tag. If we find * one, see if it is a full match. */ - v = var_list; cp = reqpt; - while (!(v->flags & EOV)) { - if (!(v->flags & PADDING) && *cp == *(v->text)) { - tp = v->text; - while (*tp != '\0' && *tp != '=' && cp < - reqend && *cp == *tp) { + for (v = var_list; !(EOV & v->flags); v++) { + if (!(PADDING & v->flags) && *cp == *(v->text)) { + pch = v->text; + while ('\0' != *pch && '=' != *pch && cp < reqend + && *cp == *pch) { cp++; - tp++; + pch++; } - if ((*tp == '\0') || (*tp == '=')) { - while (cp < reqend && isspace((unsigned char)*cp)) + if ('\0' == *pch || '=' == *pch) { + while (cp < reqend && isspace((u_char)*cp)) cp++; - if (cp == reqend || *cp == ',') { + if (cp == reqend || ',' == *cp) { buf[0] = '\0'; *data = buf; if (cp < reqend) @@ -1968,42 +2964,37 @@ ctl_getitem( reqpt = cp; return v; } - if (*cp == '=') { + if ('=' == *cp) { cp++; tp = buf; - while (cp < reqend && isspace((unsigned char)*cp)) + while (cp < reqend && isspace((u_char)*cp)) cp++; while (cp < reqend && *cp != ',') { *tp++ = *cp++; - if (tp >= buf + sizeof(buf)) { + if ((size_t)(tp - buf) >= sizeof(buf)) { ctl_error(CERR_BADFMT); numctlbadpkts++; -#if 0 /* Avoid possible DOS attack */ -/* If we get a smarter msyslog we can re-enable this */ - msyslog(LOG_WARNING, - "Possible 'ntpdx' exploit from %s:%d (possibly spoofed)\n", - stoa(rmt_addr), SRCPORT(rmt_addr) - ); -#endif - return (0); + NLOG(NLOG_SYSEVENT) + if (quiet_until <= current_time) { + quiet_until = current_time + 300; + msyslog(LOG_WARNING, +"Possible 'ntpdx' exploit from %s#%u (possibly spoofed)", stoa(rmt_addr), SRCPORT(rmt_addr)); + } + return NULL; } } if (cp < reqend) cp++; *tp-- = '\0'; - while (tp >= buf) { - if (!isspace((unsigned int)(*tp))) - break; + while (tp >= buf && isspace((u_char)*tp)) *tp-- = '\0'; - } reqpt = cp; *data = buf; - return (v); + return v; } } cp = reqpt; } - v++; } return v; } @@ -2026,15 +3017,15 @@ control_unspec( * I return no errors and no data, unless a specified assocation * doesn't exist. */ - if (res_associd != 0) { - if ((peer = findpeerbyassoc(res_associd)) == 0) { + if (res_associd) { + peer = findpeerbyassoc(res_associd); + if (NULL == peer) { ctl_error(CERR_BADASSOC); return; } rpkt.status = htons(ctlpeerstatus(peer)); - } else { + } else rpkt.status = htons(ctlsysstatus()); - } ctl_flushpkt(0); } @@ -2050,9 +3041,11 @@ read_status( int restrict_mask ) { - register int i; - register struct peer *peer; - u_short ass_stat[CTL_MAX_DATA_LEN / sizeof(u_short)]; + struct peer *peer; + const u_char *cp; + size_t n; + /* a_st holds association ID, status pairs alternating */ + u_short a_st[CTL_MAX_DATA_LEN / sizeof(u_short)]; #ifdef DEBUG if (debug > 2) @@ -2063,167 +3056,175 @@ read_status( * zero we return all known assocation ID's. Otherwise * we return a bunch of stuff about the particular peer. */ - if (res_associd == 0) { - register int n; - - n = 0; - rpkt.status = htons(ctlsysstatus()); - for (i = 0; i < NTP_HASH_SIZE; i++) { - for (peer = assoc_hash[i]; peer != 0; - peer = peer->ass_next) { - ass_stat[n++] = htons(peer->associd); - ass_stat[n++] = - htons(ctlpeerstatus(peer)); - if (n == - CTL_MAX_DATA_LEN/sizeof(u_short)) { - ctl_putdata((char *)ass_stat, - n * sizeof(u_short), 1); - n = 0; - } - } - } - - if (n != 0) - ctl_putdata((char *)ass_stat, n * - sizeof(u_short), 1); - ctl_flushpkt(0); - } else { + if (res_associd) { peer = findpeerbyassoc(res_associd); - if (peer == 0) { + if (NULL == peer) { ctl_error(CERR_BADASSOC); - } else { - register u_char *cp; + return; + } + rpkt.status = htons(ctlpeerstatus(peer)); + if (res_authokay) + peer->num_events = 0; + /* + * For now, output everything we know about the + * peer. May be more selective later. + */ + for (cp = def_peer_var; *cp != 0; cp++) + ctl_putpeer((int)*cp, peer); + ctl_flushpkt(0); + return; + } + n = 0; + rpkt.status = htons(ctlsysstatus()); + for (peer = peer_list; peer != NULL; peer = peer->p_link) { + a_st[n++] = htons(peer->associd); + a_st[n++] = htons(ctlpeerstatus(peer)); + /* two entries each loop iteration, so n + 1 */ + if (n + 1 >= COUNTOF(a_st)) { + ctl_putdata((void *)a_st, n * sizeof(a_st[0]), + 1); + n = 0; + } + } + if (n) + ctl_putdata((void *)a_st, n * sizeof(a_st[0]), 1); + ctl_flushpkt(0); +} - rpkt.status = htons(ctlpeerstatus(peer)); - if (res_authokay) - peer->num_events = 0; - /* - * For now, output everything we know about the - * peer. May be more selective later. - */ - for (cp = def_peer_var; *cp != 0; cp++) - ctl_putpeer((int)*cp, peer); - ctl_flushpkt(0); + +/* + * read_peervars - half of read_variables() implementation + */ +static void +read_peervars(void) +{ + const struct ctl_var *v; + struct peer *peer; + const u_char *cp; + size_t i; + char * valuep; + u_char wants[CP_MAXCODE + 1]; + u_int gotvar; + + /* + * Wants info for a particular peer. See if we know + * the guy. + */ + peer = findpeerbyassoc(res_associd); + if (NULL == peer) { + ctl_error(CERR_BADASSOC); + return; + } + rpkt.status = htons(ctlpeerstatus(peer)); + if (res_authokay) + peer->num_events = 0; + ZERO(wants); + gotvar = 0; + while (NULL != (v = ctl_getitem(peer_var, &valuep))) { + if (v->flags & EOV) { + ctl_error(CERR_UNKNOWNVAR); + return; } + INSIST(v->code < COUNTOF(wants)); + wants[v->code] = 1; + gotvar = 1; } + if (gotvar) { + for (i = 1; i < COUNTOF(wants); i++) + if (wants[i]) + ctl_putpeer(i, peer); + } else + for (cp = def_peer_var; *cp != 0; cp++) + ctl_putpeer((int)*cp, peer); + ctl_flushpkt(0); } /* - * read_variables - return the variables the caller asks for + * read_sysvars - half of read_variables() implementation */ -/*ARGSUSED*/ static void -read_variables( - struct recvbuf *rbufp, - int restrict_mask - ) +read_sysvars(void) { - register struct ctl_var *v; - register int i; - char *valuep; + const struct ctl_var *v; + struct ctl_var *kv; + u_int n; + u_int gotvar; + const u_char *cs; + char * valuep; + const char * pch; u_char *wants; - unsigned int gotvar = (CS_MAXCODE > CP_MAXCODE) ? (CS_MAXCODE + - 1) : (CP_MAXCODE + 1); - if (res_associd == 0) { - /* - * Wants system variables. Figure out which he wants - * and give them to him. - */ - rpkt.status = htons(ctlsysstatus()); - if (res_authokay) - ctl_sys_num_events = 0; - gotvar += count_var(ext_sys_var); - wants = (u_char *)emalloc(gotvar); - memset((char *)wants, 0, gotvar); - gotvar = 0; - while ((v = ctl_getitem(sys_var, &valuep)) != 0) { - if (v->flags & EOV) { - if ((v = ctl_getitem(ext_sys_var, - &valuep)) != 0) { - if (v->flags & EOV) { - ctl_error(CERR_UNKNOWNVAR); - free((char *)wants); - return; - } - wants[CS_MAXCODE + 1 + - v->code] = 1; - gotvar = 1; - continue; - } else { - break; /* shouldn't happen ! */ - } - } + size_t wants_count; + + /* + * Wants system variables. Figure out which he wants + * and give them to him. + */ + rpkt.status = htons(ctlsysstatus()); + if (res_authokay) + ctl_sys_num_events = 0; + wants_count = CS_MAXCODE + 1 + count_var(ext_sys_var); + wants = emalloc_zero(wants_count); + gotvar = 0; + while (NULL != (v = ctl_getitem(sys_var, &valuep))) { + if (!(EOV & v->flags)) { + INSIST(v->code < wants_count); wants[v->code] = 1; gotvar = 1; - } - if (gotvar) { - for (i = 1; i <= CS_MAXCODE; i++) - if (wants[i]) - ctl_putsys(i); - for (i = 0; ext_sys_var && - !(ext_sys_var[i].flags & EOV); i++) - if (wants[i + CS_MAXCODE + 1]) - ctl_putdata(ext_sys_var[i].text, - strlen(ext_sys_var[i].text), - 0); } else { - register u_char *cs; - register struct ctl_var *kv; - - for (cs = def_sys_var; *cs != 0; cs++) - ctl_putsys((int)*cs); - for (kv = ext_sys_var; kv && !(kv->flags & EOV); - kv++) - if (kv->flags & DEF) - ctl_putdata(kv->text, - strlen(kv->text), 0); - } - free((char *)wants); - } else { - register struct peer *peer; - - /* - * Wants info for a particular peer. See if we know - * the guy. - */ - peer = findpeerbyassoc(res_associd); - if (peer == 0) { - ctl_error(CERR_BADASSOC); - return; - } - rpkt.status = htons(ctlpeerstatus(peer)); - if (res_authokay) - peer->num_events = 0; - wants = (u_char *)emalloc(gotvar); - memset((char*)wants, 0, gotvar); - gotvar = 0; - while ((v = ctl_getitem(peer_var, &valuep)) != 0) { - if (v->flags & EOV) { + v = ctl_getitem(ext_sys_var, &valuep); + INSIST(v != NULL); + if (EOV & v->flags) { ctl_error(CERR_UNKNOWNVAR); - free((char *)wants); + free(wants); return; } - wants[v->code] = 1; + n = v->code + CS_MAXCODE + 1; + INSIST(n < wants_count); + wants[n] = 1; gotvar = 1; } - if (gotvar) { - for (i = 1; i <= CP_MAXCODE; i++) - if (wants[i]) - ctl_putpeer(i, peer); - } else { - register u_char *cp; - - for (cp = def_peer_var; *cp != 0; cp++) - ctl_putpeer((int)*cp, peer); - } - free((char *)wants); } + if (gotvar) { + for (n = 1; n <= CS_MAXCODE; n++) + if (wants[n]) + ctl_putsys(n); + for (n = 0; n + CS_MAXCODE + 1 < wants_count; n++) + if (wants[n + CS_MAXCODE + 1]) { + pch = ext_sys_var[n].text; + ctl_putdata(pch, strlen(pch), 0); + } + } else { + for (cs = def_sys_var; *cs != 0; cs++) + ctl_putsys((int)*cs); + for (kv = ext_sys_var; kv && !(EOV & kv->flags); kv++) + if (DEF & kv->flags) + ctl_putdata(kv->text, strlen(kv->text), + 0); + } + free(wants); ctl_flushpkt(0); } /* + * read_variables - return the variables the caller asks for + */ +/*ARGSUSED*/ +static void +read_variables( + struct recvbuf *rbufp, + int restrict_mask + ) +{ + if (res_associd) + read_peervars(); + else + read_sysvars(); +} + + +/* * write_variables - write into variables. We only allow leap bit * writing this way. */ @@ -2234,11 +3235,16 @@ write_variables( int restrict_mask ) { - register struct ctl_var *v; - register int ext_var; + const struct ctl_var *v; + int ext_var; char *valuep; - long val = 0; + long val; + size_t octets; + char *vareqv; + const char *t; + char *tt; + val = 0; /* * If he's trying to write into a peer tell him no way */ @@ -2275,7 +3281,7 @@ write_variables( return; } if (!ext_var && (*valuep == '\0' || !atoint(valuep, - &val))) { + &val))) { ctl_error(CERR_BADFMT); return; } @@ -2285,30 +3291,19 @@ write_variables( } if (ext_var) { - char *s = (char *)emalloc(strlen(v->text) + - strlen(valuep) + 2); - const char *t; - char *tt = s; - + octets = strlen(v->text) + strlen(valuep) + 2; + vareqv = emalloc(octets); + tt = vareqv; t = v->text; while (*t && *t != '=') *tt++ = *t++; - *tt++ = '='; - strcat(tt, valuep); - set_sys_var(s, strlen(s)+1, v->flags); - free(s); + memcpy(tt, valuep, 1 + strlen(valuep)); + set_sys_var(vareqv, 1 + strlen(vareqv), v->flags); + free(vareqv); } else { - /* - * This one seems sane. Save it. - */ - switch(v->code) { - - case CS_LEAP: - default: - ctl_error(CERR_UNSPEC); /* really */ - return; - } + ctl_error(CERR_UNSPEC); /* really */ + return; } } @@ -2317,10 +3312,10 @@ write_variables( */ /* if (leapind != ~0 || leapwarn != ~0) { - if (!leap_setleap((int)leapind, (int)leapwarn)) { - ctl_error(CERR_PERMISSION); - return; - } + if (!leap_setleap((int)leapind, (int)leapwarn)) { + ctl_error(CERR_PERMISSION); + return; + } } */ ctl_flushpkt(0); @@ -2328,11 +3323,1035 @@ write_variables( /* - * read_clock_status - return clock radio status + * configure() processes ntpq :config/config-from-file, allowing + * generic runtime reconfiguration. + */ +static void configure( + struct recvbuf *rbufp, + int restrict_mask + ) +{ + size_t data_count; + int retval; + + /* I haven't yet implemented changes to an existing association. + * Hence check if the association id is 0 + */ + if (res_associd != 0) { + ctl_error(CERR_BADVALUE); + return; + } + + if (RES_NOMODIFY & restrict_mask) { + snprintf(remote_config.err_msg, + sizeof(remote_config.err_msg), + "runtime configuration prohibited by restrict ... nomodify"); + ctl_putdata(remote_config.err_msg, + strlen(remote_config.err_msg), 0); + ctl_flushpkt(0); + NLOG(NLOG_SYSINFO) + msyslog(LOG_NOTICE, + "runtime config from %s rejected due to nomodify restriction", + stoa(&rbufp->recv_srcadr)); + sys_restricted++; + return; + } + + /* Initialize the remote config buffer */ + data_count = remoteconfig_cmdlength(reqpt, reqend); + + if (data_count > sizeof(remote_config.buffer) - 2) { + snprintf(remote_config.err_msg, + sizeof(remote_config.err_msg), + "runtime configuration failed: request too long"); + ctl_putdata(remote_config.err_msg, + strlen(remote_config.err_msg), 0); + ctl_flushpkt(0); + msyslog(LOG_NOTICE, + "runtime config from %s rejected: request too long", + stoa(&rbufp->recv_srcadr)); + return; + } + /* Bug 2853 -- check if all characters were acceptable */ + if (data_count != (size_t)(reqend - reqpt)) { + snprintf(remote_config.err_msg, + sizeof(remote_config.err_msg), + "runtime configuration failed: request contains an unprintable character"); + ctl_putdata(remote_config.err_msg, + strlen(remote_config.err_msg), 0); + ctl_flushpkt(0); + msyslog(LOG_NOTICE, + "runtime config from %s rejected: request contains an unprintable character: %0x", + stoa(&rbufp->recv_srcadr), + reqpt[data_count]); + return; + } + + memcpy(remote_config.buffer, reqpt, data_count); + /* The buffer has no trailing linefeed or NUL right now. For + * logging, we do not want a newline, so we do that first after + * adding the necessary NUL byte. + */ + remote_config.buffer[data_count] = '\0'; + DPRINTF(1, ("Got Remote Configuration Command: %s\n", + remote_config.buffer)); + msyslog(LOG_NOTICE, "%s config: %s", + stoa(&rbufp->recv_srcadr), + remote_config.buffer); + + /* Now we have to make sure there is a NL/NUL sequence at the + * end of the buffer before we parse it. + */ + remote_config.buffer[data_count++] = '\n'; + remote_config.buffer[data_count] = '\0'; + remote_config.pos = 0; + remote_config.err_pos = 0; + remote_config.no_errors = 0; + config_remotely(&rbufp->recv_srcadr); + + /* + * Check if errors were reported. If not, output 'Config + * Succeeded'. Else output the error count. It would be nice + * to output any parser error messages. + */ + if (0 == remote_config.no_errors) { + retval = snprintf(remote_config.err_msg, + sizeof(remote_config.err_msg), + "Config Succeeded"); + if (retval > 0) + remote_config.err_pos += retval; + } + + ctl_putdata(remote_config.err_msg, remote_config.err_pos, 0); + ctl_flushpkt(0); + + DPRINTF(1, ("Reply: %s\n", remote_config.err_msg)); + + if (remote_config.no_errors > 0) + msyslog(LOG_NOTICE, "%d error in %s config", + remote_config.no_errors, + stoa(&rbufp->recv_srcadr)); +} + + +/* + * derive_nonce - generate client-address-specific nonce value + * associated with a given timestamp. + */ +static u_int32 derive_nonce( + sockaddr_u * addr, + u_int32 ts_i, + u_int32 ts_f + ) +{ + static u_int32 salt[4]; + static u_long last_salt_update; + union d_tag { + u_char digest[EVP_MAX_MD_SIZE]; + u_int32 extract; + } d; + EVP_MD_CTX ctx; + u_int len; + + while (!salt[0] || current_time - last_salt_update >= 3600) { + salt[0] = ntp_random(); + salt[1] = ntp_random(); + salt[2] = ntp_random(); + salt[3] = ntp_random(); + last_salt_update = current_time; + } + + EVP_DigestInit(&ctx, EVP_get_digestbynid(NID_md5)); + EVP_DigestUpdate(&ctx, salt, sizeof(salt)); + EVP_DigestUpdate(&ctx, &ts_i, sizeof(ts_i)); + EVP_DigestUpdate(&ctx, &ts_f, sizeof(ts_f)); + if (IS_IPV4(addr)) + EVP_DigestUpdate(&ctx, &SOCK_ADDR4(addr), + sizeof(SOCK_ADDR4(addr))); + else + EVP_DigestUpdate(&ctx, &SOCK_ADDR6(addr), + sizeof(SOCK_ADDR6(addr))); + EVP_DigestUpdate(&ctx, &NSRCPORT(addr), sizeof(NSRCPORT(addr))); + EVP_DigestUpdate(&ctx, salt, sizeof(salt)); + EVP_DigestFinal(&ctx, d.digest, &len); + + return d.extract; +} + + +/* + * generate_nonce - generate client-address-specific nonce string. + */ +static void generate_nonce( + struct recvbuf * rbufp, + char * nonce, + size_t nonce_octets + ) +{ + u_int32 derived; + + derived = derive_nonce(&rbufp->recv_srcadr, + rbufp->recv_time.l_ui, + rbufp->recv_time.l_uf); + snprintf(nonce, nonce_octets, "%08x%08x%08x", + rbufp->recv_time.l_ui, rbufp->recv_time.l_uf, derived); +} + + +/* + * validate_nonce - validate client-address-specific nonce string. + * + * Returns TRUE if the local calculation of the nonce matches the + * client-provided value and the timestamp is recent enough. + */ +static int validate_nonce( + const char * pnonce, + struct recvbuf * rbufp + ) +{ + u_int ts_i; + u_int ts_f; + l_fp ts; + l_fp now_delta; + u_int supposed; + u_int derived; + + if (3 != sscanf(pnonce, "%08x%08x%08x", &ts_i, &ts_f, &supposed)) + return FALSE; + + ts.l_ui = (u_int32)ts_i; + ts.l_uf = (u_int32)ts_f; + derived = derive_nonce(&rbufp->recv_srcadr, ts.l_ui, ts.l_uf); + get_systime(&now_delta); + L_SUB(&now_delta, &ts); + + return (supposed == derived && now_delta.l_ui < 16); +} + + +/* + * send_random_tag_value - send a randomly-generated three character + * tag prefix, a '.', an index, a '=' and a + * random integer value. + * + * To try to force clients to ignore unrecognized tags in mrulist, + * reslist, and ifstats responses, the first and last rows are spiced + * with randomly-generated tag names with correct .# index. Make it + * three characters knowing that none of the currently-used subscripted + * tags have that length, avoiding the need to test for + * tag collision. + */ +static void +send_random_tag_value( + int indx + ) +{ + int noise; + char buf[32]; + + noise = rand() ^ (rand() << 16); + buf[0] = 'a' + noise % 26; + noise >>= 5; + buf[1] = 'a' + noise % 26; + noise >>= 5; + buf[2] = 'a' + noise % 26; + noise >>= 5; + buf[3] = '.'; + snprintf(&buf[4], sizeof(buf) - 4, "%d", indx); + ctl_putuint(buf, noise); +} + + +/* + * Send a MRU list entry in response to a "ntpq -c mrulist" operation. + * + * To keep clients honest about not depending on the order of values, + * and thereby avoid being locked into ugly workarounds to maintain + * backward compatibility later as new fields are added to the response, + * the order is random. + */ +static void +send_mru_entry( + mon_entry * mon, + int count + ) +{ + const char first_fmt[] = "first.%d"; + const char ct_fmt[] = "ct.%d"; + const char mv_fmt[] = "mv.%d"; + const char rs_fmt[] = "rs.%d"; + char tag[32]; + u_char sent[6]; /* 6 tag=value pairs */ + u_int32 noise; + u_int which; + u_int remaining; + const char * pch; + + remaining = COUNTOF(sent); + ZERO(sent); + noise = (u_int32)(rand() ^ (rand() << 16)); + while (remaining > 0) { + which = (noise & 7) % COUNTOF(sent); + noise >>= 3; + while (sent[which]) + which = (which + 1) % COUNTOF(sent); + + switch (which) { + + case 0: + snprintf(tag, sizeof(tag), addr_fmt, count); + pch = sptoa(&mon->rmtadr); + ctl_putunqstr(tag, pch, strlen(pch)); + break; + + case 1: + snprintf(tag, sizeof(tag), last_fmt, count); + ctl_putts(tag, &mon->last); + break; + + case 2: + snprintf(tag, sizeof(tag), first_fmt, count); + ctl_putts(tag, &mon->first); + break; + + case 3: + snprintf(tag, sizeof(tag), ct_fmt, count); + ctl_putint(tag, mon->count); + break; + + case 4: + snprintf(tag, sizeof(tag), mv_fmt, count); + ctl_putuint(tag, mon->vn_mode); + break; + + case 5: + snprintf(tag, sizeof(tag), rs_fmt, count); + ctl_puthex(tag, mon->flags); + break; + } + sent[which] = TRUE; + remaining--; + } +} + + +/* + * read_mru_list - supports ntpq's mrulist command. + * + * The challenge here is to match ntpdc's monlist functionality without + * being limited to hundreds of entries returned total, and without + * requiring state on the server. If state were required, ntpq's + * mrulist command would require authentication. + * + * The approach was suggested by Ry Jones. A finite and variable number + * of entries are retrieved per request, to avoid having responses with + * such large numbers of packets that socket buffers are overflowed and + * packets lost. The entries are retrieved oldest-first, taking into + * account that the MRU list will be changing between each request. We + * can expect to see duplicate entries for addresses updated in the MRU + * list during the fetch operation. In the end, the client can assemble + * a close approximation of the MRU list at the point in time the last + * response was sent by ntpd. The only difference is it may be longer, + * containing some number of oldest entries which have since been + * reclaimed. If necessary, the protocol could be extended to zap those + * from the client snapshot at the end, but so far that doesn't seem + * useful. + * + * To accomodate the changing MRU list, the starting point for requests + * after the first request is supplied as a series of last seen + * timestamps and associated addresses, the newest ones the client has + * received. As long as at least one of those entries hasn't been + * bumped to the head of the MRU list, ntpd can pick up at that point. + * Otherwise, the request is failed and it is up to ntpq to back up and + * provide the next newest entry's timestamps and addresses, conceivably + * backing up all the way to the starting point. + * + * input parameters: + * nonce= Regurgitated nonce retrieved by the client + * previously using CTL_OP_REQ_NONCE, demonstrating + * ability to receive traffic sent to its address. + * frags= Limit on datagrams (fragments) in response. Used + * by newer ntpq versions instead of limit= when + * retrieving multiple entries. + * limit= Limit on MRU entries returned. One of frags= or + * limit= must be provided. + * limit=1 is a special case: Instead of fetching + * beginning with the supplied starting point's + * newer neighbor, fetch the supplied entry, and + * in that case the #.last timestamp can be zero. + * This enables fetching a single entry by IP + * address. When limit is not one and frags= is + * provided, the fragment limit controls. + * mincount= (decimal) Return entries with count >= mincount. + * laddr= Return entries associated with the server's IP + * address given. No port specification is needed, + * and any supplied is ignored. + * resall= 0x-prefixed hex restrict bits which must all be + * lit for an MRU entry to be included. + * Has precedence over any resany=. + * resany= 0x-prefixed hex restrict bits, at least one of + * which must be list for an MRU entry to be + * included. + * last.0= 0x-prefixed hex l_fp timestamp of newest entry + * which client previously received. + * addr.0= text of newest entry's IP address and port, + * IPv6 addresses in bracketed form: [::]:123 + * last.1= timestamp of 2nd newest entry client has. + * addr.1= address of 2nd newest entry. + * [...] + * + * ntpq provides as many last/addr pairs as will fit in a single request + * packet, except for the first request in a MRU fetch operation. + * + * The response begins with a new nonce value to be used for any + * followup request. Following the nonce is the next newer entry than + * referred to by last.0 and addr.0, if the "0" entry has not been + * bumped to the front. If it has, the first entry returned will be the + * next entry newer than referred to by last.1 and addr.1, and so on. + * If none of the referenced entries remain unchanged, the request fails + * and ntpq backs up to the next earlier set of entries to resync. + * + * Except for the first response, the response begins with confirmation + * of the entry that precedes the first additional entry provided: + * + * last.older= hex l_fp timestamp matching one of the input + * .last timestamps, which entry now precedes the + * response 0. entry in the MRU list. + * addr.older= text of address corresponding to older.last. + * + * And in any case, a successful response contains sets of values + * comprising entries, with the oldest numbered 0 and incrementing from + * there: + * + * addr.# text of IPv4 or IPv6 address and port + * last.# hex l_fp timestamp of last receipt + * first.# hex l_fp timestamp of first receipt + * ct.# count of packets received + * mv.# mode and version + * rs.# restriction mask (RES_* bits) + * + * Note the code currently assumes there are no valid three letter + * tags sent with each row, and needs to be adjusted if that changes. + * + * The client should accept the values in any order, and ignore .# + * values which it does not understand, to allow a smooth path to + * future changes without requiring a new opcode. Clients can rely + * on all *.0 values preceding any *.1 values, that is all values for + * a given index number are together in the response. + * + * The end of the response list is noted with one or two tag=value + * pairs. Unconditionally: + * + * now= 0x-prefixed l_fp timestamp at the server marking + * the end of the operation. + * + * If any entries were returned, now= is followed by: + * + * last.newest= hex l_fp identical to last.# of the prior + * entry. + */ +static void read_mru_list( + struct recvbuf *rbufp, + int restrict_mask + ) +{ + const char nonce_text[] = "nonce"; + const char frags_text[] = "frags"; + const char limit_text[] = "limit"; + const char mincount_text[] = "mincount"; + const char resall_text[] = "resall"; + const char resany_text[] = "resany"; + const char maxlstint_text[] = "maxlstint"; + const char laddr_text[] = "laddr"; + const char resaxx_fmt[] = "0x%hx"; + u_int limit; + u_short frags; + u_short resall; + u_short resany; + int mincount; + u_int maxlstint; + sockaddr_u laddr; + struct interface * lcladr; + u_int count; + u_int ui; + u_int uf; + l_fp last[16]; + sockaddr_u addr[COUNTOF(last)]; + char buf[128]; + struct ctl_var * in_parms; + const struct ctl_var * v; + char * val; + const char * pch; + char * pnonce; + int nonce_valid; + size_t i; + int priors; + u_short hash; + mon_entry * mon; + mon_entry * prior_mon; + l_fp now; + + if (RES_NOMRULIST & restrict_mask) { + ctl_error(CERR_PERMISSION); + NLOG(NLOG_SYSINFO) + msyslog(LOG_NOTICE, + "mrulist from %s rejected due to nomrulist restriction", + stoa(&rbufp->recv_srcadr)); + sys_restricted++; + return; + } + /* + * fill in_parms var list with all possible input parameters. + */ + in_parms = NULL; + set_var(&in_parms, nonce_text, sizeof(nonce_text), 0); + set_var(&in_parms, frags_text, sizeof(frags_text), 0); + set_var(&in_parms, limit_text, sizeof(limit_text), 0); + set_var(&in_parms, mincount_text, sizeof(mincount_text), 0); + set_var(&in_parms, resall_text, sizeof(resall_text), 0); + set_var(&in_parms, resany_text, sizeof(resany_text), 0); + set_var(&in_parms, maxlstint_text, sizeof(maxlstint_text), 0); + set_var(&in_parms, laddr_text, sizeof(laddr_text), 0); + for (i = 0; i < COUNTOF(last); i++) { + snprintf(buf, sizeof(buf), last_fmt, (int)i); + set_var(&in_parms, buf, strlen(buf) + 1, 0); + snprintf(buf, sizeof(buf), addr_fmt, (int)i); + set_var(&in_parms, buf, strlen(buf) + 1, 0); + } + + /* decode input parms */ + pnonce = NULL; + frags = 0; + limit = 0; + mincount = 0; + resall = 0; + resany = 0; + maxlstint = 0; + lcladr = NULL; + priors = 0; + ZERO(last); + ZERO(addr); + + while (NULL != (v = ctl_getitem(in_parms, &val)) && + !(EOV & v->flags)) { + int si; + + if (!strcmp(nonce_text, v->text)) { + if (NULL != pnonce) + free(pnonce); + pnonce = estrdup(val); + } else if (!strcmp(frags_text, v->text)) { + sscanf(val, "%hu", &frags); + } else if (!strcmp(limit_text, v->text)) { + sscanf(val, "%u", &limit); + } else if (!strcmp(mincount_text, v->text)) { + if (1 != sscanf(val, "%d", &mincount) || + mincount < 0) + mincount = 0; + } else if (!strcmp(resall_text, v->text)) { + sscanf(val, resaxx_fmt, &resall); + } else if (!strcmp(resany_text, v->text)) { + sscanf(val, resaxx_fmt, &resany); + } else if (!strcmp(maxlstint_text, v->text)) { + sscanf(val, "%u", &maxlstint); + } else if (!strcmp(laddr_text, v->text)) { + if (decodenetnum(val, &laddr)) + lcladr = getinterface(&laddr, 0); + } else if (1 == sscanf(v->text, last_fmt, &si) && + (size_t)si < COUNTOF(last)) { + if (2 == sscanf(val, "0x%08x.%08x", &ui, &uf)) { + last[si].l_ui = ui; + last[si].l_uf = uf; + if (!SOCK_UNSPEC(&addr[si]) && + si == priors) + priors++; + } + } else if (1 == sscanf(v->text, addr_fmt, &si) && + (size_t)si < COUNTOF(addr)) { + if (decodenetnum(val, &addr[si]) + && last[si].l_ui && last[si].l_uf && + si == priors) + priors++; + } + } + free_varlist(in_parms); + in_parms = NULL; + + /* return no responses until the nonce is validated */ + if (NULL == pnonce) + return; + + nonce_valid = validate_nonce(pnonce, rbufp); + free(pnonce); + if (!nonce_valid) + return; + + if ((0 == frags && !(0 < limit && limit <= MRU_ROW_LIMIT)) || + frags > MRU_FRAGS_LIMIT) { + ctl_error(CERR_BADVALUE); + return; + } + + /* + * If either frags or limit is not given, use the max. + */ + if (0 != frags && 0 == limit) + limit = UINT_MAX; + else if (0 != limit && 0 == frags) + frags = MRU_FRAGS_LIMIT; + + /* + * Find the starting point if one was provided. + */ + mon = NULL; + for (i = 0; i < (size_t)priors; i++) { + hash = MON_HASH(&addr[i]); + for (mon = mon_hash[hash]; + mon != NULL; + mon = mon->hash_next) + if (ADDR_PORT_EQ(&mon->rmtadr, &addr[i])) + break; + if (mon != NULL) { + if (L_ISEQU(&mon->last, &last[i])) + break; + mon = NULL; + } + } + + /* If a starting point was provided... */ + if (priors) { + /* and none could be found unmodified... */ + if (NULL == mon) { + /* tell ntpq to try again with older entries */ + ctl_error(CERR_UNKNOWNVAR); + return; + } + /* confirm the prior entry used as starting point */ + ctl_putts("last.older", &mon->last); + pch = sptoa(&mon->rmtadr); + ctl_putunqstr("addr.older", pch, strlen(pch)); + + /* + * Move on to the first entry the client doesn't have, + * except in the special case of a limit of one. In + * that case return the starting point entry. + */ + if (limit > 1) + mon = PREV_DLIST(mon_mru_list, mon, mru); + } else { /* start with the oldest */ + mon = TAIL_DLIST(mon_mru_list, mru); + } + + /* + * send up to limit= entries in up to frags= datagrams + */ + get_systime(&now); + generate_nonce(rbufp, buf, sizeof(buf)); + ctl_putunqstr("nonce", buf, strlen(buf)); + prior_mon = NULL; + for (count = 0; + mon != NULL && res_frags < frags && count < limit; + mon = PREV_DLIST(mon_mru_list, mon, mru)) { + + if (mon->count < mincount) + continue; + if (resall && resall != (resall & mon->flags)) + continue; + if (resany && !(resany & mon->flags)) + continue; + if (maxlstint > 0 && now.l_ui - mon->last.l_ui > + maxlstint) + continue; + if (lcladr != NULL && mon->lcladr != lcladr) + continue; + + send_mru_entry(mon, count); + if (!count) + send_random_tag_value(0); + count++; + prior_mon = mon; + } + + /* + * If this batch completes the MRU list, say so explicitly with + * a now= l_fp timestamp. + */ + if (NULL == mon) { + if (count > 1) + send_random_tag_value(count - 1); + ctl_putts("now", &now); + /* if any entries were returned confirm the last */ + if (prior_mon != NULL) + ctl_putts("last.newest", &prior_mon->last); + } + ctl_flushpkt(0); +} + + +/* + * Send a ifstats entry in response to a "ntpq -c ifstats" request. + * + * To keep clients honest about not depending on the order of values, + * and thereby avoid being locked into ugly workarounds to maintain + * backward compatibility later as new fields are added to the response, + * the order is random. + */ +static void +send_ifstats_entry( + endpt * la, + u_int ifnum + ) +{ + const char addr_fmtu[] = "addr.%u"; + const char bcast_fmt[] = "bcast.%u"; + const char en_fmt[] = "en.%u"; /* enabled */ + const char name_fmt[] = "name.%u"; + const char flags_fmt[] = "flags.%u"; + const char tl_fmt[] = "tl.%u"; /* ttl */ + const char mc_fmt[] = "mc.%u"; /* mcast count */ + const char rx_fmt[] = "rx.%u"; + const char tx_fmt[] = "tx.%u"; + const char txerr_fmt[] = "txerr.%u"; + const char pc_fmt[] = "pc.%u"; /* peer count */ + const char up_fmt[] = "up.%u"; /* uptime */ + char tag[32]; + u_char sent[IFSTATS_FIELDS]; /* 12 tag=value pairs */ + int noisebits; + u_int32 noise; + u_int which; + u_int remaining; + const char *pch; + + remaining = COUNTOF(sent); + ZERO(sent); + noise = 0; + noisebits = 0; + while (remaining > 0) { + if (noisebits < 4) { + noise = rand() ^ (rand() << 16); + noisebits = 31; + } + which = (noise & 0xf) % COUNTOF(sent); + noise >>= 4; + noisebits -= 4; + + while (sent[which]) + which = (which + 1) % COUNTOF(sent); + + switch (which) { + + case 0: + snprintf(tag, sizeof(tag), addr_fmtu, ifnum); + pch = sptoa(&la->sin); + ctl_putunqstr(tag, pch, strlen(pch)); + break; + + case 1: + snprintf(tag, sizeof(tag), bcast_fmt, ifnum); + if (INT_BCASTOPEN & la->flags) + pch = sptoa(&la->bcast); + else + pch = ""; + ctl_putunqstr(tag, pch, strlen(pch)); + break; + + case 2: + snprintf(tag, sizeof(tag), en_fmt, ifnum); + ctl_putint(tag, !la->ignore_packets); + break; + + case 3: + snprintf(tag, sizeof(tag), name_fmt, ifnum); + ctl_putstr(tag, la->name, strlen(la->name)); + break; + + case 4: + snprintf(tag, sizeof(tag), flags_fmt, ifnum); + ctl_puthex(tag, (u_int)la->flags); + break; + + case 5: + snprintf(tag, sizeof(tag), tl_fmt, ifnum); + ctl_putint(tag, la->last_ttl); + break; + + case 6: + snprintf(tag, sizeof(tag), mc_fmt, ifnum); + ctl_putint(tag, la->num_mcast); + break; + + case 7: + snprintf(tag, sizeof(tag), rx_fmt, ifnum); + ctl_putint(tag, la->received); + break; + + case 8: + snprintf(tag, sizeof(tag), tx_fmt, ifnum); + ctl_putint(tag, la->sent); + break; + + case 9: + snprintf(tag, sizeof(tag), txerr_fmt, ifnum); + ctl_putint(tag, la->notsent); + break; + + case 10: + snprintf(tag, sizeof(tag), pc_fmt, ifnum); + ctl_putuint(tag, la->peercnt); + break; + + case 11: + snprintf(tag, sizeof(tag), up_fmt, ifnum); + ctl_putuint(tag, current_time - la->starttime); + break; + } + sent[which] = TRUE; + remaining--; + } + send_random_tag_value((int)ifnum); +} + + +/* + * read_ifstats - send statistics for each local address, exposed by + * ntpq -c ifstats + */ +static void +read_ifstats( + struct recvbuf * rbufp + ) +{ + u_int ifidx; + endpt * la; + + /* + * loop over [0..sys_ifnum] searching ep_list for each + * ifnum in turn. + */ + for (ifidx = 0; ifidx < sys_ifnum; ifidx++) { + for (la = ep_list; la != NULL; la = la->elink) + if (ifidx == la->ifnum) + break; + if (NULL == la) + continue; + /* return stats for one local address */ + send_ifstats_entry(la, ifidx); + } + ctl_flushpkt(0); +} + +static void +sockaddrs_from_restrict_u( + sockaddr_u * psaA, + sockaddr_u * psaM, + restrict_u * pres, + int ipv6 + ) +{ + ZERO(*psaA); + ZERO(*psaM); + if (!ipv6) { + psaA->sa.sa_family = AF_INET; + psaA->sa4.sin_addr.s_addr = htonl(pres->u.v4.addr); + psaM->sa.sa_family = AF_INET; + psaM->sa4.sin_addr.s_addr = htonl(pres->u.v4.mask); + } else { + psaA->sa.sa_family = AF_INET6; + memcpy(&psaA->sa6.sin6_addr, &pres->u.v6.addr, + sizeof(psaA->sa6.sin6_addr)); + psaM->sa.sa_family = AF_INET6; + memcpy(&psaM->sa6.sin6_addr, &pres->u.v6.mask, + sizeof(psaA->sa6.sin6_addr)); + } +} + + +/* + * Send a restrict entry in response to a "ntpq -c reslist" request. + * + * To keep clients honest about not depending on the order of values, + * and thereby avoid being locked into ugly workarounds to maintain + * backward compatibility later as new fields are added to the response, + * the order is random. + */ +static void +send_restrict_entry( + restrict_u * pres, + int ipv6, + u_int idx + ) +{ + const char addr_fmtu[] = "addr.%u"; + const char mask_fmtu[] = "mask.%u"; + const char hits_fmt[] = "hits.%u"; + const char flags_fmt[] = "flags.%u"; + char tag[32]; + u_char sent[RESLIST_FIELDS]; /* 4 tag=value pairs */ + int noisebits; + u_int32 noise; + u_int which; + u_int remaining; + sockaddr_u addr; + sockaddr_u mask; + const char * pch; + char * buf; + const char * match_str; + const char * access_str; + + sockaddrs_from_restrict_u(&addr, &mask, pres, ipv6); + remaining = COUNTOF(sent); + ZERO(sent); + noise = 0; + noisebits = 0; + while (remaining > 0) { + if (noisebits < 2) { + noise = rand() ^ (rand() << 16); + noisebits = 31; + } + which = (noise & 0x3) % COUNTOF(sent); + noise >>= 2; + noisebits -= 2; + + while (sent[which]) + which = (which + 1) % COUNTOF(sent); + + switch (which) { + + case 0: + snprintf(tag, sizeof(tag), addr_fmtu, idx); + pch = stoa(&addr); + ctl_putunqstr(tag, pch, strlen(pch)); + break; + + case 1: + snprintf(tag, sizeof(tag), mask_fmtu, idx); + pch = stoa(&mask); + ctl_putunqstr(tag, pch, strlen(pch)); + break; + + case 2: + snprintf(tag, sizeof(tag), hits_fmt, idx); + ctl_putuint(tag, pres->count); + break; + + case 3: + snprintf(tag, sizeof(tag), flags_fmt, idx); + match_str = res_match_flags(pres->mflags); + access_str = res_access_flags(pres->flags); + if ('\0' == match_str[0]) { + pch = access_str; + } else { + LIB_GETBUF(buf); + snprintf(buf, LIB_BUFLENGTH, "%s %s", + match_str, access_str); + pch = buf; + } + ctl_putunqstr(tag, pch, strlen(pch)); + break; + } + sent[which] = TRUE; + remaining--; + } + send_random_tag_value((int)idx); +} + + +static void +send_restrict_list( + restrict_u * pres, + int ipv6, + u_int * pidx + ) +{ + for ( ; pres != NULL; pres = pres->link) { + send_restrict_entry(pres, ipv6, *pidx); + (*pidx)++; + } +} + + +/* + * read_addr_restrictions - returns IPv4 and IPv6 access control lists + */ +static void +read_addr_restrictions( + struct recvbuf * rbufp +) +{ + u_int idx; + + idx = 0; + send_restrict_list(restrictlist4, FALSE, &idx); + send_restrict_list(restrictlist6, TRUE, &idx); + ctl_flushpkt(0); +} + + +/* + * read_ordlist - CTL_OP_READ_ORDLIST_A for ntpq -c ifstats & reslist + */ +static void +read_ordlist( + struct recvbuf * rbufp, + int restrict_mask + ) +{ + const char ifstats_s[] = "ifstats"; + const size_t ifstats_chars = COUNTOF(ifstats_s) - 1; + const char addr_rst_s[] = "addr_restrictions"; + const size_t a_r_chars = COUNTOF(addr_rst_s) - 1; + struct ntp_control * cpkt; + u_short qdata_octets; + + /* + * CTL_OP_READ_ORDLIST_A was first named CTL_OP_READ_IFSTATS and + * used only for ntpq -c ifstats. With the addition of reslist + * the same opcode was generalized to retrieve ordered lists + * which require authentication. The request data is empty or + * contains "ifstats" (not null terminated) to retrieve local + * addresses and associated stats. It is "addr_restrictions" + * to retrieve the IPv4 then IPv6 remote address restrictions, + * which are access control lists. Other request data return + * CERR_UNKNOWNVAR. + */ + cpkt = (struct ntp_control *)&rbufp->recv_pkt; + qdata_octets = ntohs(cpkt->count); + if (0 == qdata_octets || (ifstats_chars == qdata_octets && + !memcmp(ifstats_s, cpkt->u.data, ifstats_chars))) { + read_ifstats(rbufp); + return; + } + if (a_r_chars == qdata_octets && + !memcmp(addr_rst_s, cpkt->u.data, a_r_chars)) { + read_addr_restrictions(rbufp); + return; + } + ctl_error(CERR_UNKNOWNVAR); +} + + +/* + * req_nonce - CTL_OP_REQ_NONCE for ntpq -c mrulist prerequisite. + */ +static void req_nonce( + struct recvbuf * rbufp, + int restrict_mask + ) +{ + char buf[64]; + + generate_nonce(rbufp, buf, sizeof(buf)); + ctl_putunqstr("nonce", buf, strlen(buf)); + ctl_flushpkt(0); +} + + +/* + * read_clockstatus - return clock radio status */ /*ARGSUSED*/ static void -read_clock_status( +read_clockstatus( struct recvbuf *rbufp, int restrict_mask ) @@ -2343,108 +4362,91 @@ read_clock_status( */ ctl_error(CERR_BADASSOC); #else - register struct ctl_var *v; - register int i; - register struct peer *peer; - char *valuep; - u_char *wants; - unsigned int gotvar; - struct refclockstat clock_stat; - - if (res_associd == 0) { + const struct ctl_var * v; + int i; + struct peer * peer; + char * valuep; + u_char * wants; + size_t wants_alloc; + int gotvar; + const u_char * cc; + struct ctl_var * kv; + struct refclockstat cs; + if (res_associd != 0) { + peer = findpeerbyassoc(res_associd); + } else { /* * Find a clock for this jerk. If the system peer - * is a clock use it, else search the hash tables - * for one. + * is a clock use it, else search peer_list for one. */ - if (sys_peer != 0 && (sys_peer->flags & FLAG_REFCLOCK)) - { + if (sys_peer != NULL && (FLAG_REFCLOCK & + sys_peer->flags)) peer = sys_peer; - } else { - peer = 0; - for (i = 0; peer == 0 && i < NTP_HASH_SIZE; i++) { - for (peer = assoc_hash[i]; peer != 0; - peer = peer->ass_next) { - if (peer->flags & FLAG_REFCLOCK) - break; - } - } - if (peer == 0) { - ctl_error(CERR_BADASSOC); - return; - } - } - } else { - peer = findpeerbyassoc(res_associd); - if (peer == 0 || !(peer->flags & FLAG_REFCLOCK)) { - ctl_error(CERR_BADASSOC); - return; - } + else + for (peer = peer_list; + peer != NULL; + peer = peer->p_link) + if (FLAG_REFCLOCK & peer->flags) + break; + } + if (NULL == peer || !(FLAG_REFCLOCK & peer->flags)) { + ctl_error(CERR_BADASSOC); + return; } - /* * If we got here we have a peer which is a clock. Get his * status. */ - clock_stat.kv_list = (struct ctl_var *)0; - refclock_control(&peer->srcadr, (struct refclockstat *)0, - &clock_stat); - + cs.kv_list = NULL; + refclock_control(&peer->srcadr, NULL, &cs); + kv = cs.kv_list; /* * Look for variables in the packet. */ - rpkt.status = htons(ctlclkstatus(&clock_stat)); - gotvar = CC_MAXCODE + 1 + count_var(clock_stat.kv_list); - wants = (u_char *)emalloc(gotvar); - memset((char*)wants, 0, gotvar); - gotvar = 0; - while ((v = ctl_getitem(clock_var, &valuep)) != 0) { - if (v->flags & EOV) { - if ((v = ctl_getitem(clock_stat.kv_list, - &valuep)) != 0) { - if (v->flags & EOV) { - ctl_error(CERR_UNKNOWNVAR); - free((char*)wants); - free_varlist(clock_stat.kv_list); - return; - } - wants[CC_MAXCODE + 1 + v->code] = 1; - gotvar = 1; - continue; - } else { - break; /* shouldn't happen ! */ + rpkt.status = htons(ctlclkstatus(&cs)); + wants_alloc = CC_MAXCODE + 1 + count_var(kv); + wants = emalloc_zero(wants_alloc); + gotvar = FALSE; + while (NULL != (v = ctl_getitem(clock_var, &valuep))) { + if (!(EOV & v->flags)) { + wants[v->code] = TRUE; + gotvar = TRUE; + } else { + v = ctl_getitem(kv, &valuep); + INSIST(NULL != v); + if (EOV & v->flags) { + ctl_error(CERR_UNKNOWNVAR); + free(wants); + free_varlist(cs.kv_list); + return; } + wants[CC_MAXCODE + 1 + v->code] = TRUE; + gotvar = TRUE; } - wants[v->code] = 1; - gotvar = 1; } if (gotvar) { for (i = 1; i <= CC_MAXCODE; i++) if (wants[i]) - ctl_putclock(i, &clock_stat, 1); - for (i = 0; clock_stat.kv_list && - !(clock_stat.kv_list[i].flags & EOV); i++) - if (wants[i + CC_MAXCODE + 1]) - ctl_putdata(clock_stat.kv_list[i].text, - strlen(clock_stat.kv_list[i].text), - 0); + ctl_putclock(i, &cs, TRUE); + if (kv != NULL) + for (i = 0; !(EOV & kv[i].flags); i++) + if (wants[i + CC_MAXCODE + 1]) + ctl_putdata(kv[i].text, + strlen(kv[i].text), + FALSE); } else { - register u_char *cc; - register struct ctl_var *kv; - for (cc = def_clock_var; *cc != 0; cc++) - ctl_putclock((int)*cc, &clock_stat, 0); - for (kv = clock_stat.kv_list; kv && !(kv->flags & EOV); - kv++) - if (kv->flags & DEF) + ctl_putclock((int)*cc, &cs, FALSE); + for ( ; kv != NULL && !(EOV & kv->flags); kv++) + if (DEF & kv->flags) ctl_putdata(kv->text, strlen(kv->text), - 0); + FALSE); } - free((char*)wants); - free_varlist(clock_stat.kv_list); + free(wants); + free_varlist(cs.kv_list); ctl_flushpkt(0); #endif @@ -2452,11 +4454,11 @@ read_clock_status( /* - * write_clock_status - we don't do this + * write_clockstatus - we don't do this */ /*ARGSUSED*/ static void -write_clock_status( +write_clockstatus( struct recvbuf *rbufp, int restrict_mask ) @@ -2500,7 +4502,7 @@ set_trap( * an error if it can't assign the trap. */ if (!ctlsettrap(&rbufp->recv_srcadr, rbufp->dstadr, traptype, - (int)res_version)) + (int)res_version)) ctl_error(CERR_NORESOURCE); ctl_flushpkt(0); } @@ -2541,14 +4543,15 @@ unset_trap( */ int ctlsettrap( - struct sockaddr_storage *raddr, + sockaddr_u *raddr, struct interface *linter, int traptype, int version ) { - register struct ctl_trap *tp; - register struct ctl_trap *tptouse; + size_t n; + struct ctl_trap *tp; + struct ctl_trap *tptouse; /* * See if we can find this trap. If so, we only need update @@ -2584,16 +4587,17 @@ ctlsettrap( * have to. Clear out anyone who's expired while we're at it. */ tptouse = NULL; - for (tp = ctl_trap; tp < &ctl_trap[CTL_MAXTRAPS]; tp++) { - if ((tp->tr_flags & TRAP_INUSE) && - !(tp->tr_flags & TRAP_CONFIGURED) && + for (n = 0; n < COUNTOF(ctl_traps); n++) { + tp = &ctl_traps[n]; + if ((TRAP_INUSE & tp->tr_flags) && + !(TRAP_CONFIGURED & tp->tr_flags) && ((tp->tr_settime + CTL_TRAPTIME) > current_time)) { tp->tr_flags = 0; num_ctl_traps--; } - if (!(tp->tr_flags & TRAP_INUSE)) { + if (!(TRAP_INUSE & tp->tr_flags)) { tptouse = tp; - } else if (!(tp->tr_flags & TRAP_CONFIGURED)) { + } else if (!(TRAP_CONFIGURED & tp->tr_flags)) { switch (traptype) { case TRAP_TYPE_CONFIG: @@ -2601,12 +4605,12 @@ ctlsettrap( tptouse = tp; break; } - if (tptouse->tr_flags & TRAP_NONPRIO && - !(tp->tr_flags & TRAP_NONPRIO)) + if ((TRAP_NONPRIO & tptouse->tr_flags) && + !(TRAP_NONPRIO & tp->tr_flags)) break; - if (!(tptouse->tr_flags & TRAP_NONPRIO) - && tp->tr_flags & TRAP_NONPRIO) { + if (!(TRAP_NONPRIO & tptouse->tr_flags) + && (TRAP_NONPRIO & tp->tr_flags)) { tptouse = tp; break; } @@ -2616,12 +4620,12 @@ ctlsettrap( break; case TRAP_TYPE_PRIO: - if (tp->tr_flags & TRAP_NONPRIO) { + if ( TRAP_NONPRIO & tp->tr_flags) { if (tptouse == NULL || - (tptouse->tr_flags & - TRAP_INUSE && - tptouse->tr_origtime < - tp->tr_origtime)) + ((TRAP_INUSE & + tptouse->tr_flags) && + tptouse->tr_origtime < + tp->tr_origtime)) tptouse = tp; } break; @@ -2662,7 +4666,7 @@ ctlsettrap( */ int ctlclrtrap( - struct sockaddr_storage *raddr, + sockaddr_u *raddr, struct interface *linter, int traptype ) @@ -2673,7 +4677,7 @@ ctlclrtrap( return (0); if (tp->tr_flags & TRAP_CONFIGURED - && traptype != TRAP_TYPE_CONFIG) + && traptype != TRAP_TYPE_CONFIG) return (0); tp->tr_flags = 0; @@ -2687,20 +4691,19 @@ ctlclrtrap( */ static struct ctl_trap * ctlfindtrap( - struct sockaddr_storage *raddr, + sockaddr_u *raddr, struct interface *linter ) { - register struct ctl_trap *tp; + size_t n; - for (tp = ctl_trap; tp < &ctl_trap[CTL_MAXTRAPS]; tp++) { - if ((tp->tr_flags & TRAP_INUSE) - && (NSRCPORT(raddr) == NSRCPORT(&tp->tr_addr)) - && SOCKCMP(raddr, &tp->tr_addr) - && (linter == tp->tr_localaddr) ) - return (tp); - } - return (struct ctl_trap *)NULL; + for (n = 0; n < COUNTOF(ctl_traps); n++) + if ((ctl_traps[n].tr_flags & TRAP_INUSE) + && ADDR_PORT_EQ(raddr, &ctl_traps[n].tr_addr) + && (linter == ctl_traps[n].tr_localaddr)) + return &ctl_traps[n]; + + return NULL; } @@ -2709,69 +4712,80 @@ ctlfindtrap( */ void report_event( - int err, - struct peer *peer + int err, /* error code */ + struct peer *peer, /* peer structure pointer */ + const char *str /* protostats string */ ) { - register int i; + char statstr[NTP_MAXSTRLEN]; + int i; + size_t len; /* - * Record error code in proper spots, but have mercy on the - * log file. + * Report the error to the protostats file, system log and + * trappers. */ - if (!(err & (PEER_EVENT | CRPT_EVENT))) { - if (ctl_sys_num_events < CTL_SYS_MAXEVENTS) - ctl_sys_num_events++; - if (ctl_sys_last_event != (u_char)err) { - NLOG(NLOG_SYSEVENT) - msyslog(LOG_INFO, "system event '%s' (0x%02x) status '%s' (0x%02x)", - eventstr(err), err, - sysstatstr(ctlsysstatus()), ctlsysstatus()); -#ifdef DEBUG - if (debug) - printf("report_event: system event '%s' (0x%02x) status '%s' (0x%02x)\n", - eventstr(err), err, - sysstatstr(ctlsysstatus()), - ctlsysstatus()); -#endif - ctl_sys_last_event = (u_char)err; + if (peer == NULL) { + + /* + * Discard a system report if the number of reports of + * the same type exceeds the maximum. + */ + if (ctl_sys_last_event != (u_char)err) + ctl_sys_num_events= 0; + if (ctl_sys_num_events >= CTL_SYS_MAXEVENTS) + return; + + ctl_sys_last_event = (u_char)err; + ctl_sys_num_events++; + snprintf(statstr, sizeof(statstr), + "0.0.0.0 %04x %02x %s", + ctlsysstatus(), err, eventstr(err)); + if (str != NULL) { + len = strlen(statstr); + snprintf(statstr + len, sizeof(statstr) - len, + " %s", str); } - } else if (peer != 0) { - char *src; + NLOG(NLOG_SYSEVENT) + msyslog(LOG_INFO, "%s", statstr); + } else { -#ifdef REFCLOCK + /* + * Discard a peer report if the number of reports of + * the same type exceeds the maximum for that peer. + */ + const char * src; + u_char errlast; + + errlast = (u_char)err & ~PEER_EVENT; + if (peer->last_event == errlast) + peer->num_events = 0; + if (peer->num_events >= CTL_PEER_MAXEVENTS) + return; + + peer->last_event = errlast; + peer->num_events++; if (ISREFCLOCKADR(&peer->srcadr)) src = refnumtoa(&peer->srcadr); else -#endif src = stoa(&peer->srcadr); - peer->last_event = (u_char)(err & ~PEER_EVENT); - if (peer->num_events < CTL_PEER_MAXEVENTS) - peer->num_events++; + snprintf(statstr, sizeof(statstr), + "%s %04x %02x %s", src, + ctlpeerstatus(peer), err, eventstr(err)); + if (str != NULL) { + len = strlen(statstr); + snprintf(statstr + len, sizeof(statstr) - len, + " %s", str); + } NLOG(NLOG_PEEREVENT) - msyslog(LOG_INFO, "peer %s event '%s' (0x%02x) status '%s' (0x%02x)", - src, eventstr(err), err, - peerstatstr(ctlpeerstatus(peer)), - ctlpeerstatus(peer)); -#ifdef DEBUG - if (debug) - printf( "peer %s event '%s' (0x%02x) status '%s' (0x%02x)\n", - src, eventstr(err), err, - peerstatstr(ctlpeerstatus(peer)), - ctlpeerstatus(peer)); -#endif - } else { - msyslog(LOG_ERR, - "report_event: err '%s' (0x%02x), no peer", - eventstr(err), err); -#ifdef DEBUG - printf( - "report_event: peer event '%s' (0x%02x), no peer\n", - eventstr(err), err); -#endif - return; + msyslog(LOG_INFO, "%s", statstr); } + record_proto_stats(statstr); +#if DEBUG + if (debug) + printf("event at %lu %s\n", current_time, statstr); +#endif /* * If no trappers, return. @@ -2784,87 +4798,50 @@ report_event( */ res_opcode = CTL_OP_ASYNCMSG; res_offset = 0; - res_async = 1; - res_authenticate = 0; - datapt = rpkt.data; - dataend = &(rpkt.data[CTL_MAX_DATA_LEN]); + res_async = TRUE; + res_authenticate = FALSE; + datapt = rpkt.u.data; + dataend = &rpkt.u.data[CTL_MAX_DATA_LEN]; if (!(err & PEER_EVENT)) { rpkt.associd = 0; rpkt.status = htons(ctlsysstatus()); - /* - * For now, put everything we know about system - * variables. Don't send crypto strings. - */ - for (i = 1; i <= CS_MAXCODE; i++) { -#ifdef OPENSSL - if (i > CS_VARLIST) - continue; -#endif /* OPENSSL */ + /* Include the core system variables and the list. */ + for (i = 1; i <= CS_VARLIST; i++) ctl_putsys(i); - } -#ifdef REFCLOCK - /* - * for clock exception events: add clock variables to - * reflect info on exception - */ - if (err == EVNT_CLOCKEXCPT) { - struct refclockstat clock_stat; - struct ctl_var *kv; - - clock_stat.kv_list = (struct ctl_var *)0; - refclock_control(&peer->srcadr, - (struct refclockstat *)0, &clock_stat); - ctl_puthex("refclockstatus", - ctlclkstatus(&clock_stat)); - for (i = 1; i <= CC_MAXCODE; i++) - ctl_putclock(i, &clock_stat, 0); - for (kv = clock_stat.kv_list; kv && - !(kv->flags & EOV); kv++) - if (kv->flags & DEF) - ctl_putdata(kv->text, - strlen(kv->text), 0); - free_varlist(clock_stat.kv_list); - } -#endif /* REFCLOCK */ } else { + INSIST(peer != NULL); rpkt.associd = htons(peer->associd); rpkt.status = htons(ctlpeerstatus(peer)); - /* - * Dump it all. Later, maybe less. - */ - for (i = 1; i <= CP_MAXCODE; i++) { -#ifdef OPENSSL - if (i > CP_VARLIST) - continue; -#endif /* OPENSSL */ + /* Dump it all. Later, maybe less. */ + for (i = 1; i <= CP_MAX_NOAUTOKEY; i++) ctl_putpeer(i, peer); - } #ifdef REFCLOCK /* * for clock exception events: add clock variables to * reflect info on exception */ - if (err == EVNT_PEERCLOCK) { - struct refclockstat clock_stat; + if (err == PEVNT_CLOCK) { + struct refclockstat cs; struct ctl_var *kv; - clock_stat.kv_list = (struct ctl_var *)0; - refclock_control(&peer->srcadr, - (struct refclockstat *)0, &clock_stat); + cs.kv_list = NULL; + refclock_control(&peer->srcadr, NULL, &cs); ctl_puthex("refclockstatus", - ctlclkstatus(&clock_stat)); + ctlclkstatus(&cs)); for (i = 1; i <= CC_MAXCODE; i++) - ctl_putclock(i, &clock_stat, 0); - for (kv = clock_stat.kv_list; kv && - !(kv->flags & EOV); kv++) - if (kv->flags & DEF) + ctl_putclock(i, &cs, FALSE); + for (kv = cs.kv_list; + kv != NULL && !(EOV & kv->flags); + kv++) + if (DEF & kv->flags) ctl_putdata(kv->text, - strlen(kv->text), 0); - free_varlist(clock_stat.kv_list); + strlen(kv->text), + FALSE); + free_varlist(cs.kv_list); } #endif /* REFCLOCK */ } @@ -2877,6 +4854,30 @@ report_event( /* + * mprintf_event - printf-style varargs variant of report_event() + */ +int +mprintf_event( + int evcode, /* event code */ + struct peer * p, /* may be NULL */ + const char * fmt, /* msnprintf format */ + ... + ) +{ + va_list ap; + int rc; + char msg[512]; + + va_start(ap, fmt); + rc = mvsnprintf(msg, sizeof(msg), fmt, ap); + va_end(ap); + report_event(evcode, p, msg); + + return rc; +} + + +/* * ctl_clr_stats - clear stat counters */ void @@ -2900,22 +4901,25 @@ ctl_clr_stats(void) numasyncmsgs = 0; } -static u_long +static u_short count_var( - struct ctl_var *k + const struct ctl_var *k ) { - register u_long c; + u_int c; - if (!k) - return (0); + if (NULL == k) + return 0; c = 0; - while (!(k++->flags & EOV)) + while (!(EOV & (k++)->flags)) c++; - return (c); + + ENSURE(c <= USHRT_MAX); + return (u_short)c; } + char * add_var( struct ctl_var **kv, @@ -2923,27 +4927,25 @@ add_var( u_short def ) { - register u_long c; - register struct ctl_var *k; + u_short c; + struct ctl_var *k; + char * buf; c = count_var(*kv); - + *kv = erealloc(*kv, (c + 2) * sizeof(**kv)); k = *kv; - *kv = (struct ctl_var *)emalloc((c+2)*sizeof(struct ctl_var)); - if (k) { - memmove((char *)*kv, (char *)k, - sizeof(struct ctl_var)*c); - free((char *)k); - } - (*kv)[c].code = (u_short) c; - (*kv)[c].text = (char *)emalloc(size); - (*kv)[c].flags = def; - (*kv)[c+1].code = 0; - (*kv)[c+1].text = (char *)0; - (*kv)[c+1].flags = EOV; - return (char *)(*kv)[c].text; + buf = emalloc(size); + k[c].code = c; + k[c].text = buf; + k[c].flags = def; + k[c + 1].code = 0; + k[c + 1].text = NULL; + k[c + 1].flags = EOV; + + return buf; } + void set_var( struct ctl_var **kv, @@ -2952,46 +4954,46 @@ set_var( u_short def ) { - register struct ctl_var *k; - register const char *s; - register const char *t; + struct ctl_var *k; + const char *s; + const char *t; char *td; - if (!data || !size) + if (NULL == data || !size) return; k = *kv; if (k != NULL) { - while (!(k->flags & EOV)) { - s = data; - t = k->text; - if (t) { - while (*t != '=' && *s - *t == 0) { + while (!(EOV & k->flags)) { + if (NULL == k->text) { + td = emalloc(size); + memcpy(td, data, size); + k->text = td; + k->flags = def; + return; + } else { + s = data; + t = k->text; + while (*t != '=' && *s == *t) { s++; t++; } if (*s == *t && ((*t == '=') || !*t)) { - free((void *)k->text); - td = (char *)emalloc(size); - memmove(td, data, size); - k->text =td; + td = erealloc((void *)(intptr_t)k->text, size); + memcpy(td, data, size); + k->text = td; k->flags = def; return; } - } else { - td = (char *)emalloc(size); - memmove(td, data, size); - k->text = td; - k->flags = def; - return; } k++; } } td = add_var(kv, size, def); - memmove(td, data, size); + memcpy(td, data, size); } + void set_sys_var( const char *data, @@ -3002,6 +5004,36 @@ set_sys_var( set_var(&ext_sys_var, data, size, def); } + +/* + * get_ext_sys_var() retrieves the value of a user-defined variable or + * NULL if the variable has not been setvar'd. + */ +const char * +get_ext_sys_var(const char *tag) +{ + struct ctl_var * v; + size_t c; + const char * val; + + val = NULL; + c = strlen(tag); + for (v = ext_sys_var; !(EOV & v->flags); v++) { + if (NULL != v->text && !memcmp(tag, v->text, c)) { + if ('=' == v->text[c]) { + val = v->text + c + 1; + break; + } else if ('\0' == v->text[c]) { + val = ""; + break; + } + } + } + + return val; +} + + void free_varlist( struct ctl_var *kv @@ -3010,7 +5042,7 @@ free_varlist( struct ctl_var *k; if (kv) { for (k = kv; !(k->flags & EOV); k++) - free((void *)k->text); + free((void *)(intptr_t)k->text); free((void *)kv); } } |
