ntpd System Log Messages

From: Harlan Stenn Date: Fri, 8 May 2009 21:32:49 +0000 (-0400) Subject: Stale leapsecond file fixes from Dave Mills X-Git-Tag: NTP_4_2_5P174~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b7d282c4080a0aa62333d5765cf8393339642ab;p=thirdparty%2Fntp.git Stale leapsecond file fixes from Dave Mills bk: 4a04a5019qSgFnYb-vgHUvrX9lheEA --- diff --git a/ChangeLog b/ChangeLog index b2178ee12..1122aa406 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +* Stale leapsecond file fixes from Dave Mills. (4.2.5p173) 2009/05/08 Released by Harlan Stenn * Include (4.2.4p7-RC6) (4.2.5p172) 2009/05/06 Released by Harlan Stenn diff --git a/html/decode.html b/html/decode.html index 5516ffe0c..6fe34becf 100644 --- a/html/decode.html +++ b/html/decode.html @@ -1,693 +1,854 @@ - - - ntpd System Log Messages - - - -

Event Messages and Status Words

from Alice's Adventures in Wonderland, Lewis Carroll -

Caterpillar knows all the error codes, which is more than most of us do.

Last update: - 03-May-2009 3:28 - UTC

-
-

Introduction

This page lists the status and event messages and error codes used for status reporting and monitoring. Status words are used to display the current status of the running program. There is one system status word and a peer status word for each association. There is a clock status word for each association that supports a reference clock driver. There is a flash code for each association which shows errors found in the last packet received (pkt) and during protocol processing (peer). These are commonly viewed using the ntpq program.

Significant changes in program state are reported as events. There is one set of system events and a set of peer events for each association. In adition, there is a set of clock events for each association that supports a reference clock driver. Events are normally reported to the protostats file and optionally to the system log. In addition, if the trap facility is configured, traps can be reported to a remote program that can page an administrator.

This page also includes a description of the error messages produced by the Autokey protocol. These messages are normally sent to the cryptostats file.

In the following tables the Code Field is the status or event code assigned and the Message Field a short string used for display and event reporting. The Description field contains a longer explanation of the status or event. Some messages include additional information useful for error diagnosis and performance assessment.

System Status Word

The system status word consists of four fields LI (0-1), Source (2-7), Count - (8-11) and Code (12-15). It is reported in the first line of the rv display produced by the ntpq program.

+ + +ntpd System Log Messages + + + +

Event Messages and Status Words

from Alice's Adventures in Wonderland, Lewis Carroll + +

Caterpillar knows all the error codes, which is more than most of us do.

+ +

Last update: +03-May-2009 3:28 +UTC

+
+ +

Introduction

+ +

This page also includes a description of the error messages produced by the Autokey protocol. These messages are normally sent to the cryptostats file.

+ +

System Status Word

+ +

The system status word consists of four fields LI (0-1), Source (2-7), Count (8-11) and Code (12-15). It is reported in the first line of the rv display produced by the ntpq program.

+ - - - - - - -

Leap

- Source

- Count

- Code

The Leap Field displays the system leap indicator bits coded as follows:

- - - - - - - - - - - - - - - - - - - - - - - - - - -

Code	Message	Description
`0`	`leap_none`	normal synchronized state
`1`	`leap_add_sec`	insert second after 23:59:59 of the current day
`2`	`leap_del_sec`	delete second 23:59:59 of the current day
`3`	`leap_alarm`	never synchronized

The Source Field displays the current synchronization source coded as follows:.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Code	Message	Description
`0`	`sync_unspec`	not yet synchronized
`1`	`sync_pps`	pulse-per-second signal (Cs, Ru, GPS, etc.)
`2`	`sync_lf_radio`	VLF/LF radio (WWVB, DCF77, etc.)
`3`	`sync_hf_radio`	MF/HF radio (WWV, etc.)
`4`	`sync_uhf_radio`	VHF/UHF radio/satellite (GPS, Galileo, etc.)
`5`	`sync_local`	local timecode (IRIG, LOCAL driver, etc.)
`6`	`sync_ntp`	NTP
`7`	`sync_other`	other (IEEE 1588, openntp, crony, etc.)
`8`	`sync_wristwatch`	eyeball and wristwatch
`9`	`sync_telephone`	telephone modem (ACTS, PTB, etc.)

The Count Field displays the number of events since the last time the - code changed. Upon reaching 15, subsequent events with the same code - are ignored. The Event Field displays the most recent event message - coded as follows:

+ + +

Leap

Source

Count

Code

+ + + + +

The Leap Field displays the system leap indicator bits coded as follows:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Code	Message	Description
`0`	`leap_none`	normal synchronized state
`1`	`leap_add_sec`	insert second after 23:59:59 of the current day
`2`	`leap_del_sec`	delete second 23:59:59 of the current day
`3`	`leap_alarm`	never synchronized

+ +

The Source Field displays the current synchronization source coded as follows:.

+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Code	Message	Description
`0`	`unspecified`	unspecified
`1`	`freq_not_set`	frequency file not available
`2`	`freq_set`	frequency set from frequency file
`3`	`spike_detect`	spike detected
`4`	`freq_mode`	initial frequency training mode
`5`	`clock_sync`	clock synchronized
`6`	`restart`	program restart
`7`	`panic_stop`	clock error more than 600 s
`8`	`no_system_peer`	no system peer
`9`	`leap_armed`	leap second armed from file or Autokey
`10`	`leap_disarmed`	leap second disarmed
`11`	`leap_event`	leap event
`12`	`clock_step`	clock stepped
`13`	`kern`	kernel information message

Peer Status Word

The peer status word consists of four fields: Status (0-4, Select (5-7), - Count (8-11) and Code (12-15). It is reported in the first line of - the rv associd display - produced by the ntpq program.

+ + +Code +Message +Description + + + +

0 +sync_unspec +not yet synchronized + + + +1 +sync_pps +pulse-per-second signal (Cs, Ru, GPS, etc.) + + + +2 +sync_lf_radio +VLF/LF radio (WWVB, DCF77, etc.) + + + +3 +sync_hf_radio +MF/HF radio (WWV, etc.) + + + +4 +sync_uhf_radio +VHF/UHF radio/satellite (GPS, Galileo, etc.) + + + +5 +sync_local +local timecode (IRIG, LOCAL driver, etc.) + + + +6 +sync_ntp +NTP + + + +7 +sync_other +other (IEEE 1588, openntp, crony, etc.) + + + +8 +sync_wristwatch +eyeball and wristwatch + + + +9 +sync_telephone +telephone modem (ACTS, PTB, etc.) + + + + +

The Count Field displays the number of events since the last time the code changed. Upon reaching 15, subsequent events with the same code are ignored. The Event Field displays the most recent event message coded as follows:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

no_system_peer +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Code	Message	Description
`0`	`unspecified`	unspecified
`1`	`freq_not_set`	frequency file not available
`2`	`freq_set`	frequency set from frequency file
`3`	`spike_detect`	spike detected
`4`	`freq_mode`	initial frequency training mode
`5`	`clock_sync`	clock synchronized
`6`	`restart`	program restart
`7`	`panic_stop`	clock error more than 600 s
`8`	no system peer
`9`	`leap_armed`	leap second armed from file or Autokey
`10`	`leap_disarmed`	leap second disarmed
`11`	`leap_event`	leap event
`12`	`clock_step`	clock stepped
`13`	`kern`	kernel information message

+ +

Peer Status Word

+ +

The peer status word consists of four fields: Status (0-4, Select (5-7), Count (8-11) and Code (12-15). It is reported in the first line of the rv associd display produced by the ntpq program.

+ - - - - - - -

- Status

Select

- Count

- Code

The Status Field displays the peer status code bits in hexadecimal as follows:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Code	Message	Description
`08`	`bcst`	broadcast association
`10`	`reach`	host reachable
`20`	`authenb`	authentication enabled
`40`	`auth`	authentication ok
`80`	`config`	persistent association

The Select Field displays the current selection. status The T Field displays the tally codes beginning the ntpq peers display. The values are coded as follows: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Code	Message	T	Description
`0`	`sel_reject`		discarded as not valid (TEST10-TEST13)
`1`	`sel_falsetick`	`x`	discarded by intersection algorithm
`2`	`sel_excess`	`.`	discarded by table overflow (not used)
`3`	`sel_outlyer`	`-`	discarded by the cluster algorithm
`4`	`sel_candidate`	`+`	included by the combine algorithm
`5`	`sel_backup`	`#`	backup (more than `tinker maxclock` sources)
`6`	`sel_sys.peer`	`*`	system peer
`7`	`sel_pps.peer`	`o`	PPS peer (when the prefer peer is valid)

The Count Field displays the number of events since the last time the code - changed. Upon reaching 15, subsequent events with the same code are ignored. - The Event Field displays the most recent event message coded as follows:

+ + +

Status

Select

Count

Code

+ + + + +

The Status Field displays the peer status code bits in hexadecimal as follows:

+ + + + + + + + + + + + + + + + + + + +/tr> + + + + + + + + + + + + + + + + + + + +

Code	Message	Description
`08`	`bcst`	broadcast association
`10`	`reach`	host reachable
`20`	`authenb`	authentication enabled
`40`	`auth`	authentication ok
`80`	`config`	persistent association

+ +

The Select Field displays the current selection. status The T Field displays the tally codes beginning the ntpq peers display. The values are coded as follows:

+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Code	Message	Description
`1`	`mobilize`	association mobilized
`2`	`demobilize`	association demobilized
`3`	`unreachable`	server unreachable
`4`	`reachable`	server reachable
`5`	`restart`	association restart
`6`	`no_reply`	no server found (`ntpdate` mode)
`7`	`rate_exceeded`	rate exceeded (kiss code `RATE`)
`8`	`access_denied`	access denied (kiss code `DENY`)
`9`	`leap_armed`	leap armed from server LI code
`10`	`sys_peer`	new system peer
`11`	`clock`	reference clock message (see clock status word)

Clock Status Word

The clock status word consists of four fields: Unused (0-7), Count (8-11) - and Code (12-15). It is reported in the first line of the clockvar associd display - produced by the ntpq program.

+ + +Code +Message +T +Description + + + +0 +sel_reject + +discarded as not valid (TEST10-TEST13) + + + +1 +sel_falsetick +x +discarded by intersection algorithm + + + +2 +sel_excess +. +discarded by table overflow (not used) + + + +

3 +sel_outlyer +- +discarded by the cluster algorithm + + + +4 +sel_candidate ++ +included by the combine algorithm + + + +5 +sel_backup +# +backup (more than tinker maxclock sources) + + + +6 +sel_sys.peer +* +system peer + + + +7 +sel_pps.peer +o +PPS peer (when the prefer peer is valid) + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Code	Message	Description
`01`	`mobilize`	association mobilized
`02`	`demobilize`	association demobilized
`03`	`unreachable`	server unreachable
`04`	`reachable`	server reachable
`05`	`restart`	association restart
`06`	`no_reply`	no server found (`ntpdate` mode)
`07`	`rate_exceeded`	rate exceeded (kiss code `RATE`)
`08`	`access_denied`	access denied (kiss code `DENY`)
`09`	`leap_armed`	leap armed from server LI code
`0a`	`sys_peer`	become system peer
`0b`	`clock_event`	see ckock status word
`0c`	`bad_auth`	authentication failure
`0d`	`[popcorn/tt>`	popcorn spike suppressor
`0e`	`interleave_mode`	entering interleave mode
`0f`	`interleave_error`	interleave error (recoverable)
`10`	`TAI...`	leapsecond values update from server

+ +

Clock Status Word

+ +

The clock status word consists of four fields: Unused (0-7), Count (8-11) and Code (12-15). It is reported in the first line of the clockvar associd display produced by the ntpq program.

+vvv - - - - - -

- Unused

- Count

- Code

The Count Field displays the number of events since the last clockvar command, while the Event Field displays the most recent event message coded as follows:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Code	Message	Description
`0`	`clk_unspe`	nominal
`1`	`clk_noreply`	no reply to poll
`2`	`clk_badformat`	bad timecode format
`3`	`clk_fault`	hardware or software fault
`4`	`clk_bad_signal`	signal loss
`5`	`clk_bad_date`	bad date format
`6`	`clk_bad_time`	bad time format

When the clock driver sets the code to a new value, a clock_alarm (11) peer event is reported.

Flash Status Word

The flash status word is displayed by the ntpq program rv command. It consists of a number of bits coded in hexadecimal as follows:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Code	Tag	Message	Description
`0001`	TEST1	`pkt_dup`	duplicate packet
`0002`	TEST2	`pkt_bogus`	bogus packet
`0004`	TEST3	`pkt_unsync`	protocol unsynchronized
`0008`	TEST4	`pkt_denied`	access denied
`0010`	TEST5	`pkt_auth`	bad authentication
`0020`	TEST6	`pkt_stratum`	bad synch or stratum
`0040`	TEST7	`pkt_header`	bad header
`0080`	TEST8	`pkt_autokey`	bad autokey
`0100`	TEST9	`pkt_crypto`	bad crypto
`0200`	TEST10	`peer_stratum`	peer bad synch or stratum
`0400`	TEST11	`peer_dist`	peer distance exceeded
`0800`	TEST12	`peer_loop`	peer synchronization loop
`1000`	TEST13	`peer_unreach`	peer unreachable

Kiss Codes

- Kiss codes are used in kiss-o'-death (koD) packets, billboard displays and log messages. They consist of a string of four zero-padded ASCII charactes. In practice they are informal and tend to change with time and implementation. Some of these codes can appear in the reference identifier field in ntpq billboards. Following is the current list: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Code	Description
`ACST`	manycast server
`AUTH`	authentication error
`AUTO`	Autokey sequence error
`BCST`	broadcast server
`CRYPT`	Autokey protocol error
`DENY`	access denied by server
`INIT`	association initialized
`MCST`	multicast server
`RATE`	rate exceeded
`TIME`	association timeout
`STEP`	step time change

Crypto Messages

These messages are sent to the cryptostats file when an error is detected in the Autokey protocol.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Code	Message	Description
`1`	`bad_format`	bad extension field format or length
`2`	`bad_timestamp`	bad timestamp
`3`	`bad_filestamp`	bad filestamp
`4`	`bad_public_key`	bad or missing public key
`5`	`bad_digest`	unsupported digest type
`6`	`bad_identity`	unsupported identity type
`7`	`bad_siglength`	bad signature length
`8`	`bad signature`	extension field signature not verified
`9`	`cert_not_verified`	certificate signature not verified
`10`	`cert_expired`	host certificate expired
`11`	`bad_cookie`	bad or missing cookie
`12`	`bad_leapseconds`	bad or misssing leapseconds values
`13`	`cert_missing`	bad or missing certificate
`14`	`bad_group_key`	bad or missing group key
`15`	`proto_error`	protocol error

- - + +

Unused

Count

Code

+ + + + +

The Count Field displays the number of events since the last lockvar command, while the Event Field displays the most recent event message coded as follows:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Code	Message	Description
`00`	`clk_unspe`	nominal
`01`	`clk_noreply`	no reply to poll
`02`	`clk_badformat`	bad timecode format
`03`	`clk_fault`	hardware or software fault
`04`	`clk_bad_signal`	signal loss
`05`	`clk_bad_date`	bad date format
`06`	`clk_bad_time`	bad time format

+ +

When the clock driver sets the code to a new value, a clock_alarm (11) peer event is reported.

+ +

Flash Status Word

+ +

The flash status word is displayed by the ntpq program rv command. It consists of a number of bits coded in hexadecimal as follows:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Code	Tag	Message	Description
`0001`	TEST1	`pkt_dup`	duplicate packet
`0002`	TEST2	`pkt_bogus`	bogus packet
`0004`	TEST3	`pkt_unsync`	protocol unsynchronized
`0008`	TEST4	`pkt_denied`	access denied
`0010`	TEST5	`pkt_auth`	bad authentication
`0020`	TEST6	`pkt_stratum`	bad synch or stratum
`0040`	TEST7	`pkt_header`	bad header
`0080`	TEST8	`pkt_autokey`	bad autokey
`0100`	TEST9	`pkt_crypto`	bad crypto
`0200`	TEST10	`peer_stratum`	peer bad synch or stratum
`0400`	TEST11	`peer_dist`	peer distance exceeded
`0800`	TEST12	`peer_loop`	peer synchronization loop
`1000`	TEST13	`peer_unreach`	peer unreachable

+ +

Kiss Codes

+ +

Kiss codes are used in kiss-o'-death (koD) packets, billboard displays and log messages. They consist of a string of four zero-padded ASCII charactes. In practice they are informal and tend to change with time and implementation. Some of these codes can appear in the reference identifier field in ntpq billboards. Following is the current list:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Code	Description
`ACST`	manycast server
`AUTH`	authentication error
`AUTO`	Autokey sequence error
`BCST`	broadcast server
`CRYPT`	Autokey protocol error
`DENY`	access denied by server
`INIT`	association initialized
`MCST`	multicast server
`RATE`	rate exceeded
`TIME`	association timeout
`STEP`	step time change

+ +

Crypto Messages

+ +

These messages are sent to the cryptostats file when an error is detected in the Autokey protocol.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Code	Message	Description
`01`	`bad_format`	bad extension field format or length
`02`	`bad_timestamp`	bad timestamp
`03`	`bad_filestamp`	bad filestamp
`04`	`bad_public_key`	bad or missing public key
`05`	`bad_digest`	unsupported digest type
`06`	`bad_identity`	unsupported identity type
`07`	`bad_siglength`	bad signature length
`08`	`bad signature`	extension field signature not verified
`09`	`cert_not_verified`	certificate signature not verified
`0a`	`cert_expired`	host certificate expired
`0b`	`bad_cookie`	bad or missing cookie
`0c`	`bad_leapseconds`	bad or misssing leapseconds values
`0d`	`cert_missing`	bad or missing certificate
`0e`	`bad_group_key`	bad or missing group key
`0f`	`proto_error`	protocol error

+ +

+ + + + \ No newline at end of file diff --git a/include/ntp.h b/include/ntp.h index 592ac7bc6..4b9691906 100644 --- a/include/ntp.h +++ b/include/ntp.h @@ -698,6 +698,9 @@ struct pkt { #define EVNT_LEAP 11 /* leap event */ #define EVNT_CLOCKRESET 12 /* clock step */ #define EVNT_KERN 13 /* kernel event */ +#define EVNT_TAI 14 /* TAI */ +#define EVNT_LEAPVAL 15 /* stale leapsecond values */ + /* * Peer event codes */ @@ -716,6 +719,7 @@ struct pkt { #define PEVNT_POPCORN (13 | PEER_EVENT) /* popcorn */ #define PEVNT_XLEAVE (14 | PEER_EVENT) /* interleave mode */ #define PEVNT_XERR (15 | PEER_EVENT) /* interleave error */ +#define PEVNT_TAI (16 | PEER_EVENT) /* TAI */ /* * Clock event codes diff --git a/include/ntpd.h b/include/ntpd.h index 153be35eb..45b1635f3 100644 --- a/include/ntpd.h +++ b/include/ntpd.h @@ -244,6 +244,7 @@ extern void record_crypto_stats (struct sockaddr_storage *, const char *); extern void record_timing_stats (const char *); #endif extern int sock_hash (struct sockaddr_storage *); +extern char * fstostr(time_t); extern double old_drift; extern int drift_file_sw; extern double wander_threshold; diff --git a/libntp/statestr.c b/libntp/statestr.c index b809b2028..9ad7f38e3 100644 --- a/libntp/statestr.c +++ b/libntp/statestr.c @@ -126,6 +126,8 @@ struct codestring sys_codes[] = { { EVNT_LEAP, "leap_event" }, { EVNT_CLOCKRESET, "clock_step" }, { EVNT_KERN, "kern" }, + { EVNT_TAI, "TAI" }, + { EVNT_LEAPVAL, "stale_leapsecond_values" }, { -1, "" } }; @@ -149,6 +151,7 @@ struct codestring peer_codes[] = { { PEVNT_POPCORN & ~PEER_EVENT, "popcorn" }, { PEVNT_XLEAVE & ~PEER_EVENT, "xmode" }, { PEVNT_XERR & ~PEER_EVENT, "xerr" }, + { PEVNT_TAI & ~PEER_EVENT, "TAI" }, { -1, "" } }; diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c index dcee3bb12..c33fcf74e 100644 --- a/ntpd/ntp_control.c +++ b/ntpd/ntp_control.c @@ -2797,7 +2797,7 @@ report_event( ctl_sys_last_event = (u_char)err; ctl_sys_num_events++; snprintf(statstr, NTP_MAXSTRLEN, - "0.0.0.0 %04x %02x system event: %s", + "0.0.0.0 %04x %02x %s", ctlsysstatus(), err, eventstr(err)); if (str != NULL) { strcat(statstr, " "); @@ -2829,7 +2829,7 @@ report_event( #endif src = stoa(&peer->srcadr); snprintf(statstr, NTP_MAXSTRLEN, - "%s %04x %02x peer event: %s", src, + "%s %04x %02x %s", src, ctlpeerstatus(peer), err, eventstr(err)); if (str != NULL) { strcat(statstr, " "); diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c index 0e20ae629..3d47ec5ed 100644 --- a/ntpd/ntp_crypto.c +++ b/ntpd/ntp_crypto.c @@ -943,7 +943,7 @@ crypto_recv( case CRYPTO_LEAP | CRYPTO_RESP: /* - * Discard the message if invalid We can't + * Discard the message if invalid. We can't * compare the value timestamps here, as they * can be updated by different servers. */ @@ -957,6 +957,8 @@ crypto_recv( * values and recompute the signatures. */ if (ntohl(ep->pkt[2]) > leap_expire) { + char tbuf[80], str1 [20], str2[20]; + tai_leap.tstamp = ep->tstamp; tai_leap.fstamp = ep->fstamp; tai_leap.vallen = ep->vallen; @@ -964,6 +966,11 @@ crypto_recv( leap_sec = ntohl(ep->pkt[1]); leap_expire = ntohl(ep->pkt[2]); crypto_update(); + strcpy(str1, fstostr(leap_sec)); + snprintf(tbuf, sizeof(tbuf), + "%d leap %s expire %s", leap_tai, str1, + str2); + report_event(EVNT_TAI, peer, tbuf); } peer->crypto |= CRYPTO_FLAG_LEAP; peer->flash &= ~TEST8; diff --git a/ntpd/ntp_timer.c b/ntpd/ntp_timer.c index 61dfe87fa..d831d3ca5 100644 --- a/ntpd/ntp_timer.c +++ b/ntpd/ntp_timer.c @@ -56,6 +56,7 @@ static u_long adjust_timer; /* second timer */ static u_long stats_timer; /* stats timer */ static u_long huffpuff_timer; /* huff-n'-puff timer */ u_long leapsec; /* leapseconds countdown */ +l_fp sys_time; /* current system time */ #ifdef OPENSSL static u_long revoke_timer; /* keys revoke timer */ static u_long keys_timer; /* session key timer */ @@ -250,7 +251,8 @@ timer(void) * kiss-o'-deatch function and implement the association * polling function.. */ - current_time += (1< leap_expire) + report_event(EVNT_LEAPVAL, NULL, NULL); } } diff --git a/ntpd/ntp_util.c b/ntpd/ntp_util.c index 36fa10150..9109b3ce7 100644 --- a/ntpd/ntp_util.c +++ b/ntpd/ntp_util.c @@ -339,9 +339,11 @@ stats_config( const char *invalue /* only one type so far */ ) { - FILE *fp; + FILE *fp; const char *value; - int len; + int len; + char tbuf[80]; + char str1[20], str2[20]; /* * Expand environment strings under Windows NT, since the @@ -549,14 +551,18 @@ stats_config( break; } - if (leap_file(fp) < 0) + if (leap_file(fp) < 0) { msyslog(LOG_ERR, "format error leapseconds file %s", value); - else - msyslog(LOG_NOTICE, - "leap epoch %lu expire %lu TAI offset %d from %s", - leap_sec, leap_expire, leap_tai, value); + } else { + strcpy(str1, fstostr(leap_sec)); + strcpy(str2, fstostr(leap_expire)); + snprintf(tbuf, sizeof(tbuf), + "%d leap %s expire %s", leap_tai, str1, + str2); + report_event(EVNT_TAI, NULL, tbuf); + } fclose(fp); break; @@ -1105,3 +1111,23 @@ ntp_exit(int retval) exit(retval); } #endif + +/* + * fstostr - prettyprint NTP seconds + */ +char * fstostr( + time_t fstamp + ) +{ + struct tm *tm = NULL; + static char str[20] = { '\0' }; + time_t ustamp; + + ustamp = fstamp - JAN_1970; + tm = gmtime(&ustamp); + if (tm != NULL) + snprintf(str, sizeof(str), "%04d%02d%02d%02d%02d", + tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, + tm->tm_hour, tm->tm_min); + return (str); +}

Event Messages and Status Words

Related Links

Table of Contents

Introduction

System Status Word

Event Messages and Status Words

Related Links

Table of Contents

Introduction

System Status Word

Peer Status Word

Peer Status Word

Clock Status Word

Clock Status Word

Flash Status Word

Kiss Codes

Crypto Messages

Flash Status Word

Kiss Codes

Crypto Messages