diff options
| author | delphij <delphij@FreeBSD.org> | 2015-07-15 19:21:26 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-07-15 19:21:26 +0000 |
| commit | 2a25cee78ab1d37e7d2bc40ae675646974d99f56 (patch) | |
| tree | b0302ac4be59e104f4e1e54014561a1389397192 /contrib/ntp/ntpd/refclock_oncore.c | |
| parent | a0741a75537b2e0514472ac3b28afc55a7846c30 (diff) | |
| download | FreeBSD-src-2a25cee78ab1d37e7d2bc40ae675646974d99f56.zip FreeBSD-src-2a25cee78ab1d37e7d2bc40ae675646974d99f56.tar.gz | |
MFC r280849,280915-280916,281015-281016,282097,282408,282415,283542,
284864,285169-285170,285435:
ntp 4.2.8p3.
Relnotes: yes
Approved by: re (?)
Diffstat (limited to 'contrib/ntp/ntpd/refclock_oncore.c')
| -rw-r--r-- | contrib/ntp/ntpd/refclock_oncore.c | 1689 |
1 files changed, 1020 insertions, 669 deletions
diff --git a/contrib/ntp/ntpd/refclock_oncore.c b/contrib/ntp/ntpd/refclock_oncore.c index e1d23a9..30924b8 100644 --- a/contrib/ntp/ntpd/refclock_oncore.c +++ b/contrib/ntp/ntpd/refclock_oncore.c @@ -11,7 +11,7 @@ * Driver for some of the various the Motorola Oncore GPS receivers. * should work with Basic, PVT6, VP, UT, UT+, GT, GT+, SL, M12, M12+T * The receivers with TRAIM (VP, UT, UT+, M12+T), will be more accurate - * than the others. + * than the others. * The receivers without position hold (GT, GT+) will be less accurate. * * Tested with: @@ -52,6 +52,48 @@ * MANUFACTUR DATE 2J17 MANUFACTUR DATE 3G15 * * -------------------------------------------------------------------------- + * Reg Clemens (June 2009) + * BUG[1220] OK, big patch, but mostly done mechanically. Change direct calls to write + * to clockstats to a call to oncore_log, which now calls the old routine plus msyslog. + * Have to set the LOG_LEVELS of the calls for msyslog, and this was done by hand. New + * routine oncore_log. + * -------------------------------------------------------------------------- + * Reg Clemens (June 2009) + * BUG[1218] The comment on where the oncore driver gets its input file does not + * agree with the code. Change the comment. + * -------------------------------------------------------------------------- + * Reg Clemens (June 2009) + * change exit statements to return(0) in main program. I had assumed that if the + * PPS driver did not start for some reason, we shuould stop NTPD itelf. Others + * disagree. We now give an ERR log message and stop this driver. + * -------------------------------------------------------------------------- + * Reg Clemens (June 2009) + * A bytes available message for the input subsystem (Debug message). + * -------------------------------------------------------------------------- + * Reg Clemens (Nov 2008) + * This code adds a message for TRAIM messages. Users often worry about the + * driver not starting up, and it is often because of signal strength being low. + * Low signal strength will give TRAIM messages. + * -------------------------------------------------------------------------- + * Reg Clemens (Nov 2008) + * Add waiting on Almanac Message. + * -------------------------------------------------------------------------- + * Reg Clemens (Nov 2008) + * Add back in @@Bl code to do the @@Bj/@@Gj that is in later ONCOREs + * LEAP SECONDS: All of the ONCORE receivers, VP -> M12T have the @@Bj command + * that says 'Leap Pending'. As documented it only becomes true in the month + * before the leap second is to be applied, but in practice at least some of + * the receivers turn this indicator on as soon as the message is posted, which + * can be 6months early. As such, we use the Bj command to turn on the + * instance->pp->leap indicator but only run this test in December and June for + * updates on 1Jan and 1July. + * + * The @@Gj command exists in later ONCOREs, and it gives the exact date + * and size of the Leap Update. It can be emulated in the VP using the @@Bl + * command which reads the raw Satellite Broadcast Messages. + * We use these two commands to print informative messages in the clockstats + * file once per day as soon as the message appears on the satellites. + * -------------------------------------------------------------------------- * Reg Clemens (Feb 2006) * Fix some gcc4 compiler complaints * Fix possible segfault in oncore_init_shmem @@ -119,9 +161,11 @@ #include "ntp_io.h" #include "ntp_unixtime.h" #include "ntp_refclock.h" +#include "ntp_calendar.h" #include "ntp_stdlib.h" #include <stdio.h> +#include <stdarg.h> #include <ctype.h> #include <sys/stat.h> #ifdef ONCORE_SHMEM_STATUS @@ -137,9 +181,17 @@ # include "ppsapi_timepps.h" #endif -#ifdef HAVE_SYS_SIO_H -# include <sys/sio.h> -#endif +struct Bl { + int dt_ls; + int dt_lsf; + int WN; + int DN; + int WN_lsf; + int DN_lsf; + int wn_flg; + int lsf_flg; + int Bl_day; +} Bl; enum receive_state { ONCORE_NO_IDEA, @@ -265,14 +317,18 @@ struct instance { u_char count4; /* cycles thru leap after Gj to issue Bj */ u_char count5; /* cycles thru get_timestamp waiting for valid UTC correction */ u_char count5_set; /* only set count5 once */ + u_char counta; /* count for waiting on almanac message */ u_char pollcnt; u_char timeout; /* count to retry Cj after Fa self-test */ + u_char max_len; /* max length message seen by oncore_log, for debugging */ + u_char max_count; /* count for message statistics */ struct RSM rsm; /* bits extracted from Receiver Status Msg in @@Ea */ + struct Bl Bl; /* Satellite Broadcast Data Message */ u_char printed; u_char polled; u_long ev_serial; - int Rcvptr; + unsigned Rcvptr; u_char Rcvbuf[500]; u_char BEHa[160]; /* Ba, Ea or Ha */ u_char BEHn[80]; /* Bn , En , or Hn */ @@ -281,6 +337,7 @@ struct instance { u_char saw_At; u_char saw_Ay; u_char saw_Az; + s_char saw_Bj; s_char saw_Gj; u_char have_dH; u_char init_type; @@ -294,60 +351,67 @@ struct instance { u_char once; /* one pass code at top of BaEaHa */ s_char assert; u_char hardpps; + s_char pps_control; /* PPS control, M12 only */ + s_char pps_control_msg_seen; }; #define rcvbuf instance->Rcvbuf #define rcvptr instance->Rcvptr -static int oncore_start P((int, struct peer *)); -static void oncore_poll P((int, struct peer *)); -static void oncore_shutdown P((int, struct peer *)); -static void oncore_consume P((struct instance *)); -static void oncore_read_config P((struct instance *)); -static void oncore_receive P((struct recvbuf *)); -static int oncore_ppsapi P((struct instance *)); -static void oncore_get_timestamp P((struct instance *, long, long)); -static void oncore_init_shmem P((struct instance *)); - -static void oncore_antenna_report P((struct instance *, enum antenna_state)); -static void oncore_chan_test P((struct instance *)); -static void oncore_check_almanac P((struct instance *)); -static void oncore_check_antenna P((struct instance *)); -static void oncore_check_leap_sec P((struct instance *)); -static int oncore_checksum_ok P((u_char *, int)); -static void oncore_compute_dH P((struct instance *)); -static void oncore_load_almanac P((struct instance *)); -static void oncore_print_Cb P((struct instance *, u_char *)); -/* static void oncore_print_array P((u_char *, int)); */ -static void oncore_print_posn P((struct instance *)); -static void oncore_sendmsg P((int, u_char *, size_t)); -static void oncore_set_posn P((struct instance *)); -static void oncore_set_traim P((struct instance *)); -static void oncore_shmem_get_3D P((struct instance *)); -static void oncore_ss P((struct instance *)); -static int oncore_wait_almanac P((struct instance *)); - -static void oncore_msg_any P((struct instance *, u_char *, size_t, int)); -static void oncore_msg_Adef P((struct instance *, u_char *, size_t)); -static void oncore_msg_Ag P((struct instance *, u_char *, size_t)); -static void oncore_msg_As P((struct instance *, u_char *, size_t)); -static void oncore_msg_At P((struct instance *, u_char *, size_t)); -static void oncore_msg_Ay P((struct instance *, u_char *, size_t)); -static void oncore_msg_Az P((struct instance *, u_char *, size_t)); -static void oncore_msg_BaEaHa P((struct instance *, u_char *, size_t)); -static void oncore_msg_Bd P((struct instance *, u_char *, size_t)); -static void oncore_msg_Bj P((struct instance *, u_char *, size_t)); -static void oncore_msg_BnEnHn P((struct instance *, u_char *, size_t)); -static void oncore_msg_CaFaIa P((struct instance *, u_char *, size_t)); -static void oncore_msg_Cb P((struct instance *, u_char *, size_t)); -static void oncore_msg_Cf P((struct instance *, u_char *, size_t)); -static void oncore_msg_Cj P((struct instance *, u_char *, size_t)); -static void oncore_msg_Cj_id P((struct instance *, u_char *, size_t)); -static void oncore_msg_Cj_init P((struct instance *, u_char *, size_t)); -static void oncore_msg_Ga P((struct instance *, u_char *, size_t)); -static void oncore_msg_Gb P((struct instance *, u_char *, size_t)); -static void oncore_msg_Gj P((struct instance *, u_char *, size_t)); -static void oncore_msg_Sz P((struct instance *, u_char *, size_t)); +static int oncore_start (int, struct peer *); +static void oncore_poll (int, struct peer *); +static void oncore_shutdown (int, struct peer *); +static void oncore_consume (struct instance *); +static void oncore_read_config (struct instance *); +static void oncore_receive (struct recvbuf *); +static int oncore_ppsapi (struct instance *); +static void oncore_get_timestamp (struct instance *, long, long); +static void oncore_init_shmem (struct instance *); + +static void oncore_antenna_report (struct instance *, enum antenna_state); +static void oncore_chan_test (struct instance *); +static void oncore_check_almanac (struct instance *); +static void oncore_check_antenna (struct instance *); +static void oncore_check_leap_sec (struct instance *); +static int oncore_checksum_ok (u_char *, int); +static void oncore_compute_dH (struct instance *); +static void oncore_load_almanac (struct instance *); +static void oncore_log (struct instance *, int, const char *); +static int oncore_log_f (struct instance *, int, const char *, ...) + NTP_PRINTF(3, 4); +static void oncore_print_Cb (struct instance *, u_char *); +/* static void oncore_print_array (u_char *, int); */ +static void oncore_print_posn (struct instance *); +static void oncore_sendmsg (struct instance *, u_char *, size_t); +static void oncore_set_posn (struct instance *); +static void oncore_set_traim (struct instance *); +static void oncore_shmem_get_3D (struct instance *); +static void oncore_ss (struct instance *); +static int oncore_wait_almanac (struct instance *); + +static void oncore_msg_any (struct instance *, u_char *, size_t, int); +static void oncore_msg_Adef (struct instance *, u_char *, size_t); +static void oncore_msg_Ag (struct instance *, u_char *, size_t); +static void oncore_msg_As (struct instance *, u_char *, size_t); +static void oncore_msg_At (struct instance *, u_char *, size_t); +static void oncore_msg_Ay (struct instance *, u_char *, size_t); +static void oncore_msg_Az (struct instance *, u_char *, size_t); +static void oncore_msg_BaEaHa (struct instance *, u_char *, size_t); +static void oncore_msg_Bd (struct instance *, u_char *, size_t); +static void oncore_msg_Bj (struct instance *, u_char *, size_t); +static void oncore_msg_Bl (struct instance *, u_char *, size_t); +static void oncore_msg_BnEnHn (struct instance *, u_char *, size_t); +static void oncore_msg_CaFaIa (struct instance *, u_char *, size_t); +static void oncore_msg_Cb (struct instance *, u_char *, size_t); +static void oncore_msg_Cf (struct instance *, u_char *, size_t); +static void oncore_msg_Cj (struct instance *, u_char *, size_t); +static void oncore_msg_Cj_id (struct instance *, u_char *, size_t); +static void oncore_msg_Cj_init (struct instance *, u_char *, size_t); +static void oncore_msg_Ga (struct instance *, u_char *, size_t); +static void oncore_msg_Gb (struct instance *, u_char *, size_t); +static void oncore_msg_Gc (struct instance *, u_char *, size_t); +static void oncore_msg_Gj (struct instance *, u_char *, size_t); +static void oncore_msg_Sz (struct instance *, u_char *, size_t); struct refclock refclock_oncore = { oncore_start, /* start up driver */ @@ -367,51 +431,52 @@ struct refclock refclock_oncore = { static struct msg_desc { const char flag[3]; const int len; - void (*handler) P((struct instance *, u_char *, size_t)); + void (*handler) (struct instance *, u_char *, size_t); const char *fmt; int shmem; } oncore_messages[] = { /* Ea and En first since they're most common */ - { "Ea", 76, oncore_msg_BaEaHa, "mdyyhmsffffaaaaoooohhhhmmmmvvhhddtntimsdimsdimsdimsdimsdimsdimsdimsdsC" }, - { "Ba", 68, oncore_msg_BaEaHa, "mdyyhmsffffaaaaoooohhhhmmmmvvhhddtntimsdimsdimsdimsdimsdimsdsC" }, - { "Ha", 154, oncore_msg_BaEaHa, "mdyyhmsffffaaaaoooohhhhmmmmaaaaoooohhhhmmmmVVvvhhddntimsiddimsiddimsiddimsiddimsiddimsiddimsiddimsiddimsiddimsiddimsiddimsiddssrrccooooTTushmvvvvvvC" }, - { "Bn", 59, oncore_msg_BnEnHn, "otaapxxxxxxxxxxpysreensffffsffffsffffsffffsffffsffffC" }, - { "En", 69, oncore_msg_BnEnHn, "otaapxxxxxxxxxxpysreensffffsffffsffffsffffsffffsffffsffffsffffC" }, - { "Hn", 78, oncore_msg_BnEnHn, "" }, - { "Ab", 10, 0, "" }, - { "Ac", 11, 0, "" }, - { "Ad", 11, oncore_msg_Adef, "" }, - { "Ae", 11, oncore_msg_Adef, "" }, - { "Af", 15, oncore_msg_Adef, "" }, - { "Ag", 8, oncore_msg_Ag, "" }, /* Satellite mask angle */ - { "As", 20, oncore_msg_As, "" }, - { "At", 8, oncore_msg_At, "" }, - { "Au", 12, 0, "" }, - { "Av", 8, 0, "" }, - { "Aw", 8, 0, "" }, - { "Ay", 11, oncore_msg_Ay, "" }, - { "Az", 11, oncore_msg_Az, "" }, - { "AB", 8, 0, "" }, - { "Bb", 92, 0, "" }, - { "Bd", 23, oncore_msg_Bd, "" }, - { "Bj", 8, oncore_msg_Bj, "" }, - { "Ca", 9, oncore_msg_CaFaIa, "" }, - { "Cb", 33, oncore_msg_Cb, "" }, - { "Cf", 7, oncore_msg_Cf, "" }, - { "Cg", 8, 0, "" }, - { "Ch", 9, 0, "" }, - { "Cj", 294, oncore_msg_Cj, "" }, - { "Ek", 71, 0, "" }, - { "Fa", 9, oncore_msg_CaFaIa, "" }, - { "Ga", 20, oncore_msg_Ga, "" }, - { "Gb", 17, oncore_msg_Gb, "" }, - { "Gc", 8, 0, "" }, - { "Gd", 8, 0, "" }, - { "Ge", 8, 0, "" }, - { "Gj", 21, oncore_msg_Gj, "" }, - { "Ia", 10, oncore_msg_CaFaIa, "" }, - { "Sz", 8, oncore_msg_Sz, "" }, - { {0}, 7, 0, "" } + { "Ea", 76, oncore_msg_BaEaHa, "mdyyhmsffffaaaaoooohhhhmmmmvvhhddtntimsdimsdimsdimsdimsdimsdimsdimsdsC", 0 }, + { "Ba", 68, oncore_msg_BaEaHa, "mdyyhmsffffaaaaoooohhhhmmmmvvhhddtntimsdimsdimsdimsdimsdimsdsC", 0 }, + { "Ha", 154, oncore_msg_BaEaHa, "mdyyhmsffffaaaaoooohhhhmmmmaaaaoooohhhhmmmmVVvvhhddntimsiddimsiddimsiddimsiddimsiddimsiddimsiddimsiddimsiddimsiddimsiddimsiddssrrccooooTTushmvvvvvvC", 0 }, + { "Bn", 59, oncore_msg_BnEnHn, "otaapxxxxxxxxxxpysreensffffsffffsffffsffffsffffsffffC", 0 }, + { "En", 69, oncore_msg_BnEnHn, "otaapxxxxxxxxxxpysreensffffsffffsffffsffffsffffsffffsffffsffffC", 0 }, + { "Hn", 78, oncore_msg_BnEnHn, "", 0 }, + { "Ab", 10, 0, "", 0 }, + { "Ac", 11, 0, "", 0 }, + { "Ad", 11, oncore_msg_Adef, "", 0 }, + { "Ae", 11, oncore_msg_Adef, "", 0 }, + { "Af", 15, oncore_msg_Adef, "", 0 }, + { "Ag", 8, oncore_msg_Ag, "", 0 }, /* Satellite mask angle */ + { "As", 20, oncore_msg_As, "", 0 }, + { "At", 8, oncore_msg_At, "", 0 }, + { "Au", 12, 0, "", 0 }, + { "Av", 8, 0, "", 0 }, + { "Aw", 8, 0, "", 0 }, + { "Ay", 11, oncore_msg_Ay, "", 0 }, + { "Az", 11, oncore_msg_Az, "", 0 }, + { "AB", 8, 0, "", 0 }, + { "Bb", 92, 0, "", 0 }, + { "Bd", 23, oncore_msg_Bd, "", 0 }, + { "Bj", 8, oncore_msg_Bj, "", 0 }, + { "Bl", 41, oncore_msg_Bl, "", 0 }, + { "Ca", 9, oncore_msg_CaFaIa, "", 0 }, + { "Cb", 33, oncore_msg_Cb, "", 0 }, + { "Cf", 7, oncore_msg_Cf, "", 0 }, + { "Cg", 8, 0, "", 0 }, + { "Ch", 9, 0, "", 0 }, + { "Cj", 294, oncore_msg_Cj, "", 0 }, + { "Ek", 71, 0, "", 0 }, + { "Fa", 9, oncore_msg_CaFaIa, "", 0 }, + { "Ga", 20, oncore_msg_Ga, "", 0 }, + { "Gb", 17, oncore_msg_Gb, "", 0 }, + { "Gc", 8, oncore_msg_Gc, "", 0 }, + { "Gd", 8, 0, "", 0 }, + { "Ge", 8, 0, "", 0 }, + { "Gj", 21, oncore_msg_Gj, "", 0 }, + { "Ia", 10, oncore_msg_CaFaIa, "", 0 }, + { "Sz", 8, oncore_msg_Sz, "", 0 }, + { {0}, 7, 0, "", 0 } }; @@ -446,6 +511,7 @@ static u_char oncore_cmd_Bb[] = { 'B', 'b', 1 }; /* 6/8/12 Visible Satel static u_char oncore_cmd_Bd[] = { 'B', 'd', 1 }; /* 6/8/12? Almanac Status Msg. */ static u_char oncore_cmd_Be[] = { 'B', 'e', 1 }; /* 6/8/12 Request Almanac Data */ static u_char oncore_cmd_Bj[] = { 'B', 'j', 0 }; /* 6/8 Leap Second Pending */ +static u_char oncore_cmd_Bl[] = { 'B', 'l', 1 }; /* VP Satellite Broadcast Data Msg */ static u_char oncore_cmd_Bn0[] = { 'B', 'n', 0, 1, 0,10, 2, 0,0,0, 0,0,0,0,0,0,0 }; /* 6 TRAIM setup/status: msg off, traim on */ static u_char oncore_cmd_Bn[] = { 'B', 'n', 1, 1, 0,10, 2, 0,0,0, 0,0,0,0,0,0,0 }; /* 6 TRAIM setup/status: msg on, traim on */ static u_char oncore_cmd_Bnx[] = { 'B', 'n', 0, 0, 0,10, 2, 0,0,0, 0,0,0,0,0,0,0 }; /* 6 TRAIM setup/status: msg off, traim off */ @@ -465,7 +531,7 @@ static u_char oncore_cmd_Gax[] = { 'G', 'a', 0xff, 0xff, 0xff, 0xff, /* 12 0xff, 0xff, 0xff, 0xff, /* */ 0xff, 0xff, 0xff, 0xff, 0xff }; /* */ static u_char oncore_cmd_Gb[] = { 'G', 'b', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; /* 12 set Date/Time */ -static u_char oncore_cmd_Gc[] = { 'G', 'c', 1 }; /* 12 PPS Control: On Cont */ +static u_char oncore_cmd_Gc[] = { 'G', 'c', 0 }; /* 12 PPS Control: Off, On, 1+satellite,TRAIM */ static u_char oncore_cmd_Gd0[] = { 'G', 'd', 0 }; /* 12 Position Control: 3D (no hold) */ static u_char oncore_cmd_Gd1[] = { 'G', 'd', 1 }; /* 12 Position Control: 0D (3D hold) */ static u_char oncore_cmd_Gd2[] = { 'G', 'd', 2 }; /* 12 Position Control: 2D (Alt Hold) */ @@ -487,9 +553,6 @@ static u_char oncore_cmd_Ia[] = { 'I', 'a' }; /* 12 Self Test */ * Gj in UT as of 3.0, 1999 , Bj as of 1.3 */ -static char *Month[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jly", - "Aug", "Sep", "Oct", "Nov", "Dec" }; - #define DEVICE1 "/dev/oncore.serial.%d" /* name of serial device */ #define DEVICE2 "/dev/oncore.pps.%d" /* name of pps device */ @@ -531,23 +594,20 @@ oncore_start( #define STRING_LEN 32 register struct instance *instance; struct refclockproc *pp; - int fd1, fd2, num; - char device1[STRING_LEN], device2[STRING_LEN], Msg[160]; - const char *cp; + int fd1, fd2; + char device1[STRING_LEN], device2[STRING_LEN]; +#ifndef SYS_WINNT struct stat stat1, stat2; +#endif /* create instance structure for this unit */ - if (!(instance = (struct instance *) malloc(sizeof *instance))) { - perror("malloc"); - return (0); - } - memset((char *) instance, 0, sizeof *instance); + instance = emalloc(sizeof(*instance)); + memset(instance, 0, sizeof(*instance)); /* initialize miscellaneous variables */ pp = peer->procptr; - pp->unitptr = (caddr_t) instance; instance->pp = pp; instance->unit = unit; instance->peer = peer; @@ -558,32 +618,32 @@ oncore_start( instance->traim = -1; instance->traim_in = -1; instance->chan_in = -1; + instance->pps_control = -1; /* PPS control, M12 only */ + instance->pps_control_msg_seen = -1; /* Have seen response to Gc msg */ instance->model = ONCORE_UNKNOWN; instance->mode = MODE_UNKNOWN; instance->site_survey = ONCORE_SS_UNKNOWN; instance->Ag = 0xff; /* Satellite mask angle, unset by user */ instance->ant_state = ONCORE_ANTENNA_UNKNOWN; + peer->flags &= ~FLAG_PPS; /* PPS not active yet */ peer->precision = -26; peer->minpoll = 4; peer->maxpoll = 4; pp->clockdesc = "Motorola Oncore GPS Receiver"; memcpy((char *)&pp->refid, "GPS\0", (size_t) 4); - cp = "ONCORE DRIVER -- CONFIGURING"; - record_clock_stats(&(instance->peer->srcadr), cp); - + oncore_log(instance, LOG_NOTICE, "ONCORE DRIVER -- CONFIGURING"); instance->o_state = ONCORE_NO_IDEA; - cp = "state = ONCORE_NO_IDEA"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "state = ONCORE_NO_IDEA"); /* Now open files. * This is a bit complicated, a we dont want to open the same file twice * (its a problem on some OS), and device2 may not exist for the new PPS */ - (void)sprintf(device1, DEVICE1, unit); - (void)sprintf(device2, DEVICE2, unit); + (void)snprintf(device1, sizeof(device1), DEVICE1, unit); + (void)snprintf(device2, sizeof(device2), DEVICE2, unit); /* OPEN DEVICES */ /* opening different devices for fd1 and fd2 presents no problems */ @@ -594,42 +654,64 @@ oncore_start( Since things ALWAYS work if we only open the device once, we check to see if the two devices are in fact the same, then proceed to do one open or two. - */ + For use with linuxPPS we assume that the N_TTY file has been opened + and that the line discipline has been changed to N_PPS by another + program (say ppsldisc) so that the two files expected by the oncore + driver can be opened. + + Note that the linuxPPS N_PPS file is just like a N_TTY, so we can do + the stat below without error even though the file has already had its + line discipline changed by another process. + + The Windows port of ntpd arranges to return duplicate handles for + multiple opens of the same serial device, and doesn't have inodes + for serial handles, so we just open both on Windows. + */ +#ifndef SYS_WINNT if (stat(device1, &stat1)) { - sprintf(Msg, "Can't stat fd1 (%s)\n", device1); - record_clock_stats(&(instance->peer->srcadr), Msg); - exit(1); + oncore_log_f(instance, LOG_ERR, "Can't stat fd1 (%s)", + device1); + return(0); /* exit, no file, can't start driver */ } if (stat(device2, &stat2)) { - sprintf(Msg, "Can't stat fd2 (%s)\n", device2); - record_clock_stats(&(instance->peer->srcadr), Msg); - exit(1); + stat2.st_dev = stat2.st_ino = -2; + oncore_log_f(instance, LOG_ERR, "Can't stat fd2 (%s) %d %m", + device2, errno); } +#endif /* !SYS_WINNT */ - if (!(fd1 = refclock_open(device1, SPEED, LDISC_RAW))) { - sprintf(Msg, "Can't open fd1 (%s)\n", device1); - record_clock_stats(&(instance->peer->srcadr), Msg); - exit(1); + fd1 = refclock_open(device1, SPEED, LDISC_RAW); + if (fd1 <= 0) { + oncore_log_f(instance, LOG_ERR, "Can't open fd1 (%s)", + device1); + return(0); /* exit, can't open file, can't start driver */ } + /* for LINUX the PPS device is the result of a line discipline. + It seems simplest to let an external program create the appropriate + /dev/pps<n> file, and only check (carefully) for its existance here + */ + +#ifndef SYS_WINNT if ((stat1.st_dev == stat2.st_dev) && (stat1.st_ino == stat2.st_ino)) /* same device here */ fd2 = fd1; - else { /* different devices here */ - if ((fd2=open(device2, O_RDWR)) < 0) { - sprintf(Msg, "Can't open fd2 (%s)\n", device2); - record_clock_stats(&(instance->peer->srcadr), Msg); - exit(1); + else +#endif /* !SYS_WINNT */ + { /* different devices here */ + if ((fd2=tty_open(device2, O_RDWR, 0777)) < 0) { + oncore_log_f(instance, LOG_ERR, + "Can't open fd2 (%s)", device2); + return(0); /* exit, can't open PPS file, can't start driver */ } } - num = fd2; - /* open ppsapi soure */ + /* open ppsapi source */ - if (time_pps_create(num, &instance->pps_h) < 0) { - record_clock_stats(&(instance->peer->srcadr), "PPSAPI not found in kernel"); - return(0); + if (time_pps_create(fd2, &instance->pps_h) < 0) { + oncore_log(instance, LOG_ERR, "exit, PPSAPI not found in kernel"); + return(0); /* exit, don't find PPSAPI in kernel */ } /* continue initialization */ @@ -645,15 +727,17 @@ oncore_start( return(0); pp->io.clock_recv = oncore_receive; - pp->io.srcclock = (caddr_t)peer; + pp->io.srcclock = peer; pp->io.datalen = 0; pp->io.fd = fd1; if (!io_addclock(&pp->io)) { - record_clock_stats(&(instance->peer->srcadr), "ONCORE: io_addclock"); - (void) close(fd1); + oncore_log(instance, LOG_ERR, "can't do io_addclock"); + close(fd1); + pp->io.fd = -1; free(instance); return (0); } + pp->unitptr = instance; #ifdef ONCORE_SHMEM_STATUS /* @@ -671,12 +755,11 @@ oncore_start( */ instance->o_state = ONCORE_CHECK_ID; - cp = "state = ONCORE_CHECK_ID"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "state = ONCORE_CHECK_ID"); instance->timeout = 4; - oncore_sendmsg(instance->ttyfd, oncore_cmd_Cg, sizeof(oncore_cmd_Cg)); /* Set Posn Fix mode (not Idle (VP)) */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Cj, sizeof(oncore_cmd_Cj)); + oncore_sendmsg(instance, oncore_cmd_Cg, sizeof(oncore_cmd_Cg)); /* Set Posn Fix mode (not Idle (VP)) */ + oncore_sendmsg(instance, oncore_cmd_Cj, sizeof(oncore_cmd_Cj)); instance->pollcnt = 2; return (1); @@ -697,21 +780,24 @@ oncore_shutdown( struct refclockproc *pp; pp = peer->procptr; - instance = (struct instance *) pp->unitptr; + instance = pp->unitptr; - io_closeclock(&pp->io); + if (pp->io.fd != -1) + io_closeclock(&pp->io); - time_pps_destroy (instance->pps_h); + if (instance != NULL) { + time_pps_destroy (instance->pps_h); - close(instance->ttyfd); + close(instance->ttyfd); - if ((instance->ppsfd != -1) && (instance->ppsfd != instance->ttyfd)) - close(instance->ppsfd); + if ((instance->ppsfd != -1) && (instance->ppsfd != instance->ttyfd)) + close(instance->ppsfd); - if (instance->shmemfd) - close(instance->shmemfd); + if (instance->shmemfd) + close(instance->shmemfd); - free(instance); + free(instance); + } } @@ -728,19 +814,16 @@ oncore_poll( { struct instance *instance; - instance = (struct instance *) peer->procptr->unitptr; + instance = peer->procptr->unitptr; if (instance->timeout) { - char *cp; - instance->timeout--; if (instance->timeout == 0) { - cp = "Oncore: No response from @@Cj, shutting down driver"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_ERR, + "Oncore: No response from @@Cj, shutting down driver"); oncore_shutdown(unit, peer); } else { - oncore_sendmsg(instance->ttyfd, oncore_cmd_Cj, sizeof(oncore_cmd_Cj)); - cp = "Oncore: Resend @@Cj"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_sendmsg(instance, oncore_cmd_Cj, sizeof(oncore_cmd_Cj)); + oncore_log(instance, LOG_WARNING, "Oncore: Resend @@Cj"); } return; } @@ -765,15 +848,15 @@ oncore_ppsapi( ) { int cap, mode, mode1; - char *cp, Msg[160]; + const char *cp; if (time_pps_getcap(instance->pps_h, &cap) < 0) { - msyslog(LOG_ERR, "time_pps_getcap failed: %m"); + oncore_log_f(instance, LOG_ERR, "time_pps_getcap failed: %m"); return (0); } if (time_pps_getparams(instance->pps_h, &instance->pps_p) < 0) { - msyslog(LOG_ERR, "time_pps_getparams failed: %m"); + oncore_log_f(instance, LOG_ERR, "time_pps_getparams failed: %m"); return (0); } @@ -782,26 +865,27 @@ oncore_ppsapi( */ if (instance->assert) { - cp = "Assert."; + cp = "Assert"; mode = PPS_CAPTUREASSERT; mode1 = PPS_OFFSETASSERT; } else { - cp = "Clear."; + cp = "Clear"; mode = PPS_CAPTURECLEAR; mode1 = PPS_OFFSETCLEAR; } - sprintf(Msg, "Initializing timeing to %s.", cp); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_INFO, "Initializing timing to %s.", + cp); if (!(mode & cap)) { - sprintf(Msg, "Can't set timeing to %s, exiting...", cp); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_ERR, + "Can't set timing to %s, exiting...", cp); return(0); } if (!(mode1 & cap)) { - sprintf(Msg, "Can't set PPS_%sCLEAR, this will increase jitter.", cp); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_NOTICE, + "Can't set %s, this will increase jitter.", + cp); mode1 = 0; } @@ -810,8 +894,8 @@ oncore_ppsapi( instance->pps_p.mode = (mode | mode1 | PPS_TSFMT_TSPEC) & cap; if (time_pps_setparams(instance->pps_h, &instance->pps_p) < 0) { - record_clock_stats(&(instance->peer->srcadr), "ONCORE: time_pps_setparams fails"); - exit(1); + oncore_log_f(instance, LOG_ERR, "ONCORE: time_pps_setparams fails %m"); + return(0); /* exit, can't do time_pps_setparans on PPS file */ } /* If HARDPPS is on, we tell kernel */ @@ -819,7 +903,7 @@ oncore_ppsapi( if (instance->hardpps) { int i; - record_clock_stats(&(instance->peer->srcadr), "HARDPPS Set."); + oncore_log(instance, LOG_INFO, "HARDPPS Set."); if (instance->assert) i = PPS_CAPTUREASSERT; @@ -830,11 +914,12 @@ oncore_ppsapi( if (time_pps_kcbind(instance->pps_h, PPS_KC_HARDPPS, i, PPS_TSFMT_TSPEC) < 0) { - msyslog(LOG_ERR, "time_pps_kcbind failed: %m"); - record_clock_stats(&(instance->peer->srcadr), "HARDPPS failed, abort..."); + oncore_log_f(instance, LOG_ERR, "time_pps_kcbind failed: %m"); + oncore_log(instance, LOG_ERR, "HARDPPS failed, abort..."); return (0); } - pps_enable = 1; + + hardpps_enable = 1; } return(1); } @@ -847,14 +932,13 @@ oncore_init_shmem( struct instance *instance ) { - int i, l, n, fd, shmem_old_size, n1; - char Msg[160]; + int l, fd; u_char *cp, *cp1, *buf, *shmem_old; struct msg_desc *mp; struct stat sbuf; - size_t shmem_length; + size_t i, n, n1, shmem_length, shmem_old_size; - /* + /* * The first thing we do is see if there is an instance->shmem_fname file (still) * out there from a previous run. If so, we copy it in and use it to initialize * shmem (so we won't lose our almanac if we need it). @@ -863,16 +947,13 @@ oncore_init_shmem( shmem_old = 0; shmem_old_size = 0; if ((fd = open(instance->shmem_fname, O_RDONLY)) < 0) - record_clock_stats(&(instance->peer->srcadr), "ONCORE: Can't open SHMEM file"); + oncore_log(instance, LOG_WARNING, "ONCORE: Can't open SHMEM file"); else { fstat(fd, &sbuf); shmem_old_size = sbuf.st_size; if (shmem_old_size != 0) { - shmem_old = (u_char *) malloc((unsigned) sbuf.st_size); - if (shmem_old == NULL) - record_clock_stats(&(instance->peer->srcadr), "ONCORE: Can't malloc buffer for shmem_old"); - else - read(fd, shmem_old, shmem_old_size); + shmem_old = emalloc((unsigned) sbuf.st_size); + read(fd, shmem_old, shmem_old_size); } close(fd); } @@ -880,7 +961,7 @@ oncore_init_shmem( /* OK, we now create the NEW SHMEM. */ if ((instance->shmemfd = open(instance->shmem_fname, O_RDWR|O_CREAT|O_TRUNC, 0644)) < 0) { - record_clock_stats(&(instance->peer->srcadr), "ONCORE: Can't open shmem"); + oncore_log(instance, LOG_WARNING, "ONCORE: Can't open shmem"); if (shmem_old) free(shmem_old); @@ -913,16 +994,7 @@ oncore_init_shmem( } shmem_length = n + 2; - buf = malloc(shmem_length); - if (buf == NULL) { - record_clock_stats(&(instance->peer->srcadr), "ONCORE: Can't malloc buffer for shmem"); - close(instance->shmemfd); - if (shmem_old) - free(shmem_old); - - return; - } - + buf = emalloc(shmem_length); memset(buf, 0, shmem_length); /* next build the new SHMEM buffer in memory */ @@ -977,7 +1049,7 @@ oncore_init_shmem( free(buf); if (i != shmem_length) { - record_clock_stats(&(instance->peer->srcadr), "ONCORE: error writing shmem"); + oncore_log(instance, LOG_ERR, "ONCORE: error writing shmem"); close(instance->shmemfd); return; } @@ -995,9 +1067,9 @@ oncore_init_shmem( return; } - sprintf(Msg, "SHMEM (size = %ld) is CONFIGURED and available as %s", - (u_long) shmem_length, instance->shmem_fname); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_NOTICE, + "SHMEM (size = %ld) is CONFIGURED and available as %s", + (u_long) shmem_length, instance->shmem_fname); } #endif /* ONCORE_SHMEM_STATUS */ @@ -1014,10 +1086,10 @@ oncore_read_config( { /* * First we try to open the configuration file - * /etc/oncoreN + * /etc/ntp.oncore.N * where N is the unit number viz 127.127.30.N. * If we don't find it we try - * /etc/ntp.oncore.N + * /etc/ntp.oncoreN * and then * /etc/ntp.oncore * @@ -1092,7 +1164,7 @@ oncore_read_config( * For Flag2, ASSERT=0, and hence is default. * * There is an optional line, with HARDPPS on it. Including this line causes - * the PPS signal to control the kernel PLL. + * the PPS signal to control the kernel PLL. * HARDPPS can also be set with FLAG3 of the ntp.conf input. * For Flag3, 0 is disabled, and the default. * @@ -1118,6 +1190,17 @@ oncore_read_config( * elevation angle for satellites to be tracked by the receiver. The default value * is 10 deg for the VP and 0 deg for all other receivers. * + * There is an optional line with PPSCONTROL on it (only valid for M12 or M12+T + * receivers, the option is read, but ignored for all others) + * and it is followed by: + * ON Turn PPS on. This is the default and the default for other + * oncore receivers. The PPS is on even if not tracking + * any satellites. + * SATELLITE Turns PPS on if tracking at least 1 satellite, else off. + * TRAIM Turns PPS on or off controlled by TRAIM. + * The OFF option is NOT implemented, since the Oncore driver will not work + * without the PPS signal. + * * So acceptable input would be * # these are my coordinates (RWC) * LON -106 34.610 @@ -1127,22 +1210,25 @@ oncore_read_config( */ FILE *fd; - char *cp, *cc, *ca, line[100], units[2], device[20], Msg[160], **cpp; - char *dirs[] = { "/etc/ntp", "/etc", 0 }; + char *cc, *ca, line[100], units[2], device[64]; + const char *dirs[] = { "/etc/ntp", "/etc", 0 }; + const char *cp, **cpp; int i, sign, lat_flg, long_flg, ht_flg, mode, mask; double f1, f2, f3; fd = NULL; /* just to shutup gcc complaint */ for (cpp=dirs; *cpp; cpp++) { cp = *cpp; - sprintf(device, "%s/ntp.oncore.%d", cp, instance->unit); /* try "ntp.oncore.0 */ + snprintf(device, sizeof(device), "%s/ntp.oncore.%d", + cp, instance->unit); /* try "ntp.oncore.0 */ if ((fd=fopen(device, "r"))) break; - sprintf(device, "%s/ntp.oncore%d", cp, instance->unit); /* try "ntp.oncore0" */ + snprintf(device, sizeof(device), "%s/ntp.oncore%d", + cp, instance->unit); /* try "ntp.oncore0" */ if ((fd=fopen(device, "r"))) break; - sprintf(device, "%s/ntp.oncore", cp); /* and finally "ntp.oncore" */ - if ((fd=fopen(device, "r"))) + snprintf(device, sizeof(device), "%s/ntp.oncore", cp); + if ((fd=fopen(device, "r"))) /* last try "ntp.oncore" */ break; } @@ -1154,19 +1240,20 @@ oncore_read_config( mode = mask = 0; lat_flg = long_flg = ht_flg = 0; while (fgets(line, 100, fd)) { + char *cpw; /* Remove comments */ - if ((cp = strchr(line, '#'))) - *cp = '\0'; + if ((cpw = strchr(line, '#'))) + *cpw = '\0'; /* Remove trailing space */ for (i = strlen(line); - i > 0 && isascii((int)line[i - 1]) && isspace((int)line[i - 1]); + i > 0 && isascii((unsigned char)line[i - 1]) && isspace((unsigned char)line[i - 1]); ) line[--i] = '\0'; /* Remove leading space */ - for (cc = line; *cc && isascii((int)*cc) && isspace((int)*cc); cc++) + for (cc = line; *cc && isascii((unsigned char)*cc) && isspace((unsigned char)*cc); cc++) continue; /* Stop if nothing left */ @@ -1175,29 +1262,27 @@ oncore_read_config( /* Uppercase the command and find the arg */ for (ca = cc; *ca; ca++) { - if (isascii((int)*ca)) { - if (islower((int)*ca)) { - *ca = toupper(*ca); - } else if (isspace((int)*ca) || (*ca == '=')) + if (isascii((unsigned char)*ca)) { + if (islower((unsigned char)*ca)) { + *ca = toupper((unsigned char)*ca); + } else if (isspace((unsigned char)*ca) || (*ca == '=')) break; } } /* Remove space (and possible =) leading the arg */ - for (; *ca && isascii((int)*ca) && (isspace((int)*ca) || (*ca == '=')); ca++) + for (; *ca && isascii((unsigned char)*ca) && (isspace((unsigned char)*ca) || (*ca == '=')); ca++) continue; if (!strncmp(cc, "STATUS", (size_t) 6) || !strncmp(cc, "SHMEM", (size_t) 5)) { - i = strlen(ca); - instance->shmem_fname = (char *) malloc((unsigned) (i+1)); - strcpy(instance->shmem_fname, ca); + instance->shmem_fname = estrdup(ca); continue; } /* Uppercase argument as well */ - for (cp = ca; *cp; cp++) - if (isascii((int)*cp) && islower((int)*cp)) - *cp = toupper(*cp); + for (cpw = ca; *cpw; cpw++) + if (isascii((unsigned char)*cpw) && islower((unsigned char)*cpw)) + *cpw = toupper((unsigned char)*cpw); if (!strncmp(cc, "LAT", (size_t) 3)) { f1 = f2 = f3 = 0; @@ -1241,10 +1326,11 @@ oncore_read_config( f1 = 1000000000 * f1; if (f1 < 0 || f1 > 1.e9) f1 = 0; - if (f1 < 0 || f1 > 999999) { - sprintf(Msg, "PPS Cable delay of %fns out of Range, ignored", f1); - record_clock_stats(&(instance->peer->srcadr), Msg); - } else + if (f1 < 0 || f1 > 999999) + oncore_log_f(instance, LOG_WARNING, + "PPS Cable delay of %fns out of Range, ignored", + f1); + else instance->delay = f1; /* delay in ns */ } else if (!strncmp(cc, "OFFSET", (size_t) 6)) { f1 = 0; @@ -1260,10 +1346,11 @@ oncore_read_config( f1 = 1000000000 * f1; if (f1 < 0 || f1 > 1.e9) f1 = 0; - if (f1 < 0 || f1 > 999999999.) { - sprintf(Msg, "PPS Offset of %fns out of Range, ignored", f1); - record_clock_stats(&(instance->peer->srcadr), Msg); - } else + if (f1 < 0 || f1 > 999999999.) + oncore_log_f(instance, LOG_WARNING, + "PPS Offset of %fns out of Range, ignored", + f1); + else instance->offset = f1; /* offset in ns */ } else if (!strncmp(cc, "MODE", (size_t) 4)) { sscanf(ca, "%d", &mode); @@ -1291,6 +1378,18 @@ oncore_read_config( sscanf(ca, "%d", &mask); if (mask > -1 && mask < 90) instance->Ag = mask; /* Satellite mask angle */ + } else if (!strncmp(cc,"PPSCONTROL",10)) { /* pps control M12 only */ + if (!strcmp(ca,"ON") || !strcmp(ca, "CONTINUOUS")) { + instance->pps_control = 1; /* PPS always on */ + } else if (!strcmp(ca,"SATELLITE")) { + instance->pps_control = 2; /* PPS on when satellite is available */ + } else if (!strcmp(ca,"TRAIM")) { + instance->pps_control = 3; /* PPS on when TRAIM status is OK */ + } else { + oncore_log_f(instance, LOG_WARNING, + "Unknown value \"%s\" for PPSCONTROL, ignored", + cc); + } } } fclose(fd); @@ -1302,18 +1401,19 @@ oncore_read_config( instance->posn_set = 1; if (!( lat_flg && long_flg && ht_flg )) { - printf("ONCORE: incomplete data on %s\n", device); + oncore_log_f(instance, LOG_WARNING, + "ONCORE: incomplete data on %s", device); instance->posn_set = 0; if (mode == 1 || mode == 3) { - sprintf(Msg, "Input Mode = %d, but no/incomplete position, mode set to %d", mode, mode+1); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_WARNING, + "Input Mode = %d, but no/incomplete position, mode set to %d", + mode, mode+1); mode++; } } instance->init_type = mode; - sprintf(Msg, "Input mode = %d", mode); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_INFO, "Input mode = %d", mode); } @@ -1332,21 +1432,31 @@ oncore_receive( struct peer *peer; struct instance *instance; - peer = (struct peer *)rbufp->recv_srcclock; - instance = (struct instance *) peer->procptr->unitptr; + peer = rbufp->recv_peer; + instance = peer->procptr->unitptr; p = (u_char *) &rbufp->recv_space; -#if 0 +#ifdef ONCORE_VERBOSE_RECEIVE if (debug > 4) { int i; - printf("ONCORE: >>>"); - for(i=0; i<rbufp->recv_length; i++) - printf("%02x ", p[i]); - printf("\n"); - printf("ONCORE: >>>"); - for(i=0; i<rbufp->recv_length; i++) - printf("%03o ", p[i]); - printf("\n"); + char Msg[120], Msg2[10]; + + oncore_log_f(instance, LOG_DEBUG, + ">>> %d bytes available", + rbufp->recv_length); + strlcpy(Msg, ">>>", sizeof(Msg)); + for (i = 0; i < rbufp->recv_length; i++) { + snprintf(Msg2, sizeof(Msg2), "%02x ", p[i]); + strlcat(Msg, Msg2, sizeof(Msg)); + } + oncore_log(instance, LOG_DEBUG, Msg); + + strlcpy(Msg, ">>>", sizeof(Msg)); + for (i = 0; i < rbufp->recv_length; i++) { + snprintf(Msg2, sizeof(Msg2), "%03o ", p[i]); + strlcat(Msg, Msg2, sizeof(Msg)); + } + oncore_log(instance, LOG_DEBUG, Msg); } #endif @@ -1369,8 +1479,7 @@ oncore_consume( struct instance *instance ) { - int i, m; - unsigned l; + unsigned i, m, l; while (rcvptr >= 7) { if (rcvbuf[0] != '@' || rcvbuf[1] != '@') { @@ -1378,9 +1487,11 @@ oncore_consume( for (i=1; i < rcvptr-1; i++) if (rcvbuf[i] == '@' && rcvbuf[i+1] == '@') break; -#ifdef DEBUG +#ifdef ONCORE_VERBOSE_CONSUME if (debug > 4) - printf("ONCORE[%d]: >>> skipping %d chars\n", instance->unit, i); + oncore_log_f(instance, LOG_DEBUG, + ">>> skipping %d chars", + i); #endif if (i != rcvptr) memcpy(rcvbuf, rcvbuf+i, (size_t)(rcvptr-i)); @@ -1394,9 +1505,11 @@ oncore_consume( if (!strncmp(oncore_messages[m].flag, (char *)(rcvbuf+2), (size_t) 2)) break; if (m == l) { -#ifdef DEBUG +#ifdef ONCORE_VERBOSE_CONSUME if (debug > 4) - printf("ONCORE[%d]: >>> Unknown MSG, skipping 4 (%c%c)\n", instance->unit, rcvbuf[2], rcvbuf[3]); + oncore_log_f(instance, LOG_DEBUG, + ">>> Unknown MSG, skipping 4 (%c%c)", + rcvbuf[2], rcvbuf[3]); #endif memcpy(rcvbuf, rcvbuf+4, (size_t) 4); rcvptr -= 4; @@ -1404,9 +1517,12 @@ oncore_consume( } l = oncore_messages[m].len; -#if 0 +#ifdef ONCORE_VERBOSE_CONSUME if (debug > 3) - printf("ONCORE[%d]: GOT: %c%c %d of %d entry %d\n", instance->unit, rcvbuf[2], rcvbuf[3], rcvptr, l, m); + oncore_log_f(instance, LOG_DEBUG, + "GOT: %c%c %d of %d entry %d", + instance->unit, rcvbuf[2], + rcvbuf[3], rcvptr, l, m); #endif /* Got the entire message ? */ @@ -1416,9 +1532,9 @@ oncore_consume( /* are we at the end of message? should be <Cksum><CR><LF> */ if (rcvbuf[l-2] != '\r' || rcvbuf[l-1] != '\n') { -#ifdef DEBUG +#ifdef ONCORE_VERBOSE_CONSUME if (debug) - printf("ONCORE[%d]: NO <CR><LF> at end of message\n", instance->unit); + oncore_log(instance, LOG_DEBUG, "NO <CR><LF> at end of message"); #endif } else { /* check the CheckSum */ if (oncore_checksum_ok(rcvbuf, l)) { @@ -1431,13 +1547,18 @@ oncore_consume( if (oncore_messages[m].handler) oncore_messages[m].handler(instance, rcvbuf, (size_t) (l-3)); } -#ifdef DEBUG +#ifdef ONCORE_VERBOSE_CONSUME else if (debug) { - printf("ONCORE[%d]: Checksum mismatch!\n", instance->unit); - printf("ONCORE[%d]: @@%c%c ", instance->unit, rcvbuf[2], rcvbuf[3]); - for (i=4; i<l; i++) - printf("%03o ", rcvbuf[i]); - printf("\n"); + char Msg[120], Msg2[10]; + + oncore_log(instance, LOG_ERR, "Checksum mismatch!"); + snprintf(Msg, sizeof(Msg), "@@%c%c ", rcvbuf[2], rcvbuf[3]); + for (i = 4; i < l; i++) { + snprintf(Msg2, sizeof(Msg2), + "%03o ", rcvbuf[i]); + strlcat(Msg, Msg2, sizeof(Msg)); + } + oncore_log(instance, LOG_DEBUG, Msg); } #endif } @@ -1467,10 +1588,13 @@ oncore_get_timestamp( struct timeval *tsp = 0; #endif int current_mode; - u_long i; pps_params_t current_params; struct timespec timeout; + struct peer *peer; pps_info_t pps_i; + char Msg[160]; + + peer = instance->peer; #if 1 /* If we are in SiteSurvey mode, then we are in 3D mode, and we fall thru. @@ -1479,18 +1603,22 @@ oncore_get_timestamp( * This gives good time, which gets better when the SS is done. */ - if ((instance->site_survey == ONCORE_SS_DONE) && (instance->mode != MODE_0D)) + if ((instance->site_survey == ONCORE_SS_DONE) && (instance->mode != MODE_0D)) { #else /* old check, only fall thru for SS_DONE and 0D mode, 2h45m wait for ticks */ - if ((instance->site_survey != ONCORE_SS_DONE) || (instance->mode != MODE_0D)) + if ((instance->site_survey != ONCORE_SS_DONE) || (instance->mode != MODE_0D)) { #endif + peer->flags &= ~FLAG_PPS; /* problem - clear PPS FLAG */ return; + } /* Don't do anything without an almanac to define the GPS->UTC delta */ - if (instance->rsm.bad_almanac) + if (instance->rsm.bad_almanac) { + peer->flags &= ~FLAG_PPS; /* problem - clear PPS FLAG */ return; + } /* Once the Almanac is valid, the M12+T does not produce valid UTC * immediately. @@ -1500,6 +1628,7 @@ oncore_get_timestamp( if (instance->count5) { instance->count5--; + peer->flags &= ~FLAG_PPS; /* problem - clear PPS FLAG */ return; } @@ -1508,51 +1637,66 @@ oncore_get_timestamp( timeout.tv_nsec = 0; if (time_pps_fetch(instance->pps_h, PPS_TSFMT_TSPEC, &pps_i, &timeout) < 0) { - printf("ONCORE: time_pps_fetch failed\n"); + oncore_log_f(instance, LOG_ERR, + "time_pps_fetch failed %m"); + peer->flags &= ~FLAG_PPS; /* problem - clear PPS FLAG */ return; } if (instance->assert) { tsp = &pps_i.assert_timestamp; -#ifdef DEBUG +#ifdef ONCORE_VERBOSE_GET_TIMESTAMP if (debug > 2) { + u_long i; + i = (u_long) pps_i.assert_sequence; # ifdef HAVE_STRUCT_TIMESPEC - printf("ONCORE[%d]: serial/j (%lu, %lu) %ld.%09ld\n", - instance->unit, i, j, - (long)tsp->tv_sec, (long)tsp->tv_nsec); + oncore_log_f(instance, LOG_DEBUG, + "serial/j (%lu, %lu) %ld.%09ld", i, + j, (long)tsp->tv_sec, + (long)tsp->tv_nsec); # else - printf("ONCORE[%d]: serial/j (%lu, %lu) %ld.%06ld\n", - instance->unit, i, j, - (long)tsp->tv_sec, (long)tsp->tv_usec); + oncore_log_f(instance, LOG_DEBUG, + "serial/j (%lu, %lu) %ld.%06ld", i, + j, (long)tsp->tv_sec, + (long)tsp->tv_usec); # endif } #endif if (pps_i.assert_sequence == j) { - printf("ONCORE: oncore_get_timestamp, error serial pps\n"); + oncore_log(instance, LOG_NOTICE, "ONCORE: oncore_get_timestamp, error serial pps"); + peer->flags &= ~FLAG_PPS; /* problem - clear PPS FLAG */ return; } + instance->ev_serial = pps_i.assert_sequence; } else { tsp = &pps_i.clear_timestamp; -#ifdef DEBUG +#if 0 if (debug > 2) { + u_long i; + i = (u_long) pps_i.clear_sequence; # ifdef HAVE_STRUCT_TIMESPEC - printf("ONCORE[%d]: serial/j (%lu, %lu) %ld.%09ld\n", - instance->unit, i, j, (long)tsp->tv_sec, (long)tsp->tv_nsec); + oncore_log_f(instance, LOG_DEBUG, + "serial/j (%lu, %lu) %ld.%09ld", i, + j, (long)tsp->tv_sec, + (long)tsp->tv_nsec); # else - printf("ONCORE[%d]: serial/j (%lu, %lu) %ld.%06ld\n", - instance->unit, i, j, (long)tsp->tv_sec, (long)tsp->tv_usec); + oncore_log_f(instance, LOG_DEBUG, + "serial/j (%lu, %lu) %ld.%06ld", i, + j, (long)tsp->tv_sec, + (long)tsp->tv_usec); # endif } #endif if (pps_i.clear_sequence == j) { - printf("ONCORE: oncore_get_timestamp, error serial pps\n"); + oncore_log(instance, LOG_ERR, "oncore_get_timestamp, error serial pps"); + peer->flags &= ~FLAG_PPS; /* problem - clear PPS FLAG */ return; } instance->ev_serial = pps_i.clear_sequence; @@ -1611,12 +1755,16 @@ oncore_get_timestamp( */ if (time_pps_getcap(instance->pps_h, ¤t_mode) < 0) { - msyslog(LOG_ERR, "time_pps_getcap failed: %m"); + oncore_log_f(instance, LOG_ERR, + "time_pps_getcap failed: %m"); + peer->flags &= ~FLAG_PPS; /* problem - clear PPS FLAG */ return; } if (time_pps_getparams(instance->pps_h, ¤t_params) < 0) { - msyslog(LOG_ERR, "time_pps_getparams failed: %m"); + oncore_log_f(instance, LOG_ERR, + "time_pps_getparams failed: %m"); + peer->flags &= ~FLAG_PPS; /* problem - clear PPS FLAG */ return; } @@ -1631,7 +1779,7 @@ oncore_get_timestamp( current_params.clear_offset.tv_nsec = -dt2; if (time_pps_setparams(instance->pps_h, ¤t_params)) - record_clock_stats(&(instance->peer->srcadr), "ONCORE: Error doing time_pps_setparams"); + oncore_log(instance, LOG_ERR, "ONCORE: Error doing time_pps_setparams"); /* have time from UNIX origin, convert to NTP origin. */ @@ -1656,17 +1804,22 @@ oncore_get_timestamp( if (instance->chan == 6 || instance->chan == 8) { char f1[5], f2[5], f3[5], f4[5]; if (instance->traim) { - sprintf(f1, "%d", instance->BEHn[21]); - sprintf(f2, "%d", instance->BEHn[22]); - sprintf(f3, "%2d", instance->BEHn[23]*256+instance->BEHn[24]); - sprintf(f4, "%3d", (s_char) instance->BEHn[25]); + snprintf(f1, sizeof(f1), "%d", + instance->BEHn[21]); + snprintf(f2, sizeof(f2), "%d", + instance->BEHn[22]); + snprintf(f3, sizeof(f3), "%2d", + instance->BEHn[23] * 256 + + instance->BEHn[24]); + snprintf(f4, sizeof(f4), "%3d", + (s_char)instance->BEHn[25]); } else { - strcpy(f1, "x"); - strcpy(f2, "x"); - strcpy(f3, "xx"); - strcpy(f4, "xxx"); + strlcpy(f1, "x", sizeof(f1)); + strlcpy(f2, "x", sizeof(f2)); + strlcpy(f3, "xx", sizeof(f3)); + strlcpy(f4, "xxx", sizeof(f4)); } - sprintf(instance->pp->a_lastcode, /* MAX length 128, currently at 121 */ + snprintf(Msg, sizeof(Msg), /* MAX length 128, currently at 127 */ "%u.%09lu %d %d %2d %2d %2d %2ld rstat %02x dop %4.1f nsat %2d,%d traim %d,%s,%s sigma %s neg-sawtooth %s sat %d%d%d%d%d%d%d%d", ts.l_ui, j, instance->pp->year, instance->pp->day, @@ -1684,17 +1837,22 @@ oncore_get_timestamp( } else if (instance->chan == 12) { char f1[5], f2[5], f3[5], f4[5]; if (instance->traim) { - sprintf(f1, "%d", instance->BEHn[6]); - sprintf(f2, "%d", instance->BEHn[7]); - sprintf(f3, "%d", instance->BEHn[12]*256+instance->BEHn[13]); - sprintf(f4, "%3d", (s_char) instance->BEHn[14]); + snprintf(f1, sizeof(f1), "%d", + instance->BEHn[6]); + snprintf(f2, sizeof(f2), "%d", + instance->BEHn[7]); + snprintf(f3, sizeof(f3), "%d", + instance->BEHn[12] * 256 + + instance->BEHn[13]); + snprintf(f4, sizeof(f4), "%3d", + (s_char)instance->BEHn[14]); } else { - strcpy(f1, "x"); - strcpy(f2, "x"); - strcpy(f3, "x"); - strcpy(f4, "xxx"); + strlcpy(f1, "x", sizeof(f1)); + strlcpy(f2, "x", sizeof(f2)); + strlcpy(f3, "xx", sizeof(f3)); + strlcpy(f4, "xxx", sizeof(f4)); } - sprintf(instance->pp->a_lastcode, + snprintf(Msg, sizeof(Msg), "%u.%09lu %d %d %2d %2d %2d %2ld rstat %02x dop %4.1f nsat %2d,%d traim %d,%s,%s sigma %s neg-sawtooth %s sat %d%d%d%d%d%d%d%d%d%d%d%d", ts.l_ui, j, instance->pp->year, instance->pp->day, @@ -1712,23 +1870,15 @@ oncore_get_timestamp( ); } -#ifdef DEBUG - if (debug > 2) { - int n; - - n = strlen(instance->pp->a_lastcode); - printf("ONCORE[%d]: len = %d %s\n", instance->unit, n, instance->pp->a_lastcode); - } -#endif - /* and some things I dont understand (magic ntp things) */ if (!refclock_process(instance->pp)) { refclock_report(instance->peer, CEVNT_BADTIME); + peer->flags &= ~FLAG_PPS; /* problem - clear PPS FLAG */ return; } - record_clock_stats(&(instance->peer->srcadr), instance->pp->a_lastcode); + oncore_log(instance, LOG_INFO, Msg); /* this is long message above */ instance->pollcnt = 2; if (instance->polled) { @@ -1737,6 +1887,7 @@ oncore_get_timestamp( instance->pp->lastref = instance->pp->lastrec; refclock_receive(instance->peer); } + peer->flags |= FLAG_PPS; } @@ -1755,15 +1906,18 @@ oncore_msg_any( int idx ) { +#ifdef ONCORE_VERBOSE_MSG_ANY int i; const char *fmt = oncore_messages[idx].fmt; const char *p; + char *q; + char *qlim; #ifdef HAVE_GETCLOCK struct timespec ts; #endif struct timeval tv; + char Msg[120], Msg2[10]; -#ifdef DEBUG if (debug > 3) { # ifdef HAVE_GETCLOCK (void) getclock(TIMEOFDAY, &ts); @@ -1772,26 +1926,36 @@ oncore_msg_any( # else GETTIMEOFDAY(&tv, 0); # endif - printf("ONCORE[%d]: %ld.%06ld\n", instance->unit, (long) tv.tv_sec, (long) tv.tv_usec); + oncore_log(instance, LOG_DEBUG, "%ld.%06ld", + (long)tv.tv_sec, (long)tv.tv_usec); if (!*fmt) { - printf(">>@@%c%c ", buf[2], buf[3]); - for(i=2; i < len && i < 2400 ; i++) - printf("%02x", buf[i]); - printf("\n"); + snprintf(Msg, sizeof(Msg), ">>@@%c%c ", buf[2], + buf[3]); + for(i = 2; i < len && i < 2400 ; i++) { + snprintf(Msg2, sizeof(Msg2), "%02x", + buf[i]); + strlcat(Msg, Msg2, sizeof(Msg)); + } + oncore_log(instance, LOG_DEBUG, Msg); return; } else { - printf("##"); - for (p = fmt; *p; p++) { - putchar(*p); - putchar('_'); + strlcpy(Msg, "##", sizeof(Msg)); + qlim = Msg + sizeof(Msg) - 3; + for (p = fmt, q = Msg + 2; q < qlim && *p; ) { + *q++ = *p++; + *q++ = '_'; } - printf("\n%c%c", buf[2], buf[3]); + *q = '\0'; + oncore_log(instance, LOG_DEBUG, Msg); + snprintf(Msg, sizeof(Msg), "%c%c", buf[2], + buf[3]); i = 4; for (p = fmt; *p; p++) { - printf("%02x", buf[i++]); + snprintf(Msg2, "%02x", buf[i++]); + strlcat(Msg, Msg2, sizeof(Msg)); } - printf("\n"); + oncore_log(instance, LOG_DEBUG, Msg); } } #endif @@ -1820,15 +1984,17 @@ oncore_msg_Ag( u_char *buf, size_t len ) -{ char Msg[160], *cp; +{ + const char *cp; - cp = "set to"; - if (instance->o_state == ONCORE_RUN) - cp = "is"; + cp = "set to"; + if (instance->o_state == ONCORE_RUN) + cp = "is"; - instance->Ag = buf[4]; - sprintf(Msg, "Satellite mask angle %s %d degrees", cp, (int) instance->Ag); - record_clock_stats(&(instance->peer->srcadr), Msg); + instance->Ag = buf[4]; + oncore_log_f(instance, LOG_INFO, + "Satellite mask angle %s %d degrees", cp, + (int)instance->Ag); } @@ -1866,16 +2032,13 @@ oncore_msg_At( size_t len ) { - char *cp; - instance->saw_At = 1; if (instance->site_survey == ONCORE_SS_TESTING) { if (buf[4] == 2) { - record_clock_stats(&(instance->peer->srcadr), + oncore_log(instance, LOG_NOTICE, "Initiating hardware 3D site survey"); - cp = "SSstate = ONCORE_SS_HW"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "SSstate = ONCORE_SS_HW"); instance->site_survey = ONCORE_SS_HW; } } @@ -1895,8 +2058,6 @@ oncore_msg_Ay( size_t len ) { - char Msg[120]; - if (instance->saw_Ay) return; @@ -1904,8 +2065,8 @@ oncore_msg_Ay( instance->offset = buf_w32(&buf[4]); - sprintf(Msg, "PPS Offset is set to %ld ns", instance->offset); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_INFO, "PPS Offset is set to %ld ns", + instance->offset); } @@ -1921,8 +2082,6 @@ oncore_msg_Az( size_t len ) { - char Msg[120]; - if (instance->saw_Az) return; @@ -1930,8 +2089,8 @@ oncore_msg_Az( instance->delay = buf_w32(&buf[4]); - sprintf(Msg, "Cable delay is set to %ld ns", instance->delay); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_INFO, "Cable delay is set to %ld ns", + instance->delay); } @@ -1946,7 +2105,6 @@ oncore_msg_BaEaHa( ) { const char *cp; - char Msg[160]; int mode; /* OK, we are close to the RUN state now. @@ -1977,21 +2135,20 @@ oncore_msg_BaEaHa( else /* set from test */ instance->chan = instance->chan_ck; - sprintf(Msg, "Input says chan = %d", instance->chan_in); - record_clock_stats(&(instance->peer->srcadr), Msg); - sprintf(Msg, "Model # says chan = %d", instance->chan_id); - record_clock_stats(&(instance->peer->srcadr), Msg); - sprintf(Msg, "Testing says chan = %d", instance->chan_ck); - record_clock_stats(&(instance->peer->srcadr), Msg); - sprintf(Msg, "Using chan = %d", instance->chan); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_INFO, "Input says chan = %d", + instance->chan_in); + oncore_log_f(instance, LOG_INFO, "Model # says chan = %d", + instance->chan_id); + oncore_log_f(instance, LOG_INFO, "Testing says chan = %d", + instance->chan_ck); + oncore_log_f(instance, LOG_INFO, "Using chan = %d", + instance->chan); instance->o_state = ONCORE_HAVE_CHAN; - cp = "state = ONCORE_HAVE_CHAN"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "state = ONCORE_HAVE_CHAN"); instance->timeout = 4; - oncore_sendmsg(instance->ttyfd, oncore_cmd_Cj, sizeof(oncore_cmd_Cj)); + oncore_sendmsg(instance, oncore_cmd_Cj, sizeof(oncore_cmd_Cj)); return; } @@ -2008,6 +2165,15 @@ oncore_msg_BaEaHa( memcpy(instance->BEHa, buf, (size_t) (len+3)); /* Ba, Ea or Ha */ + /* check if we saw a response to Gc (M12 or M12+T */ + + if (instance->pps_control_msg_seen != -2) { + if ((instance->pps_control_msg_seen == -1) && (instance->pps_control != -1)) { + oncore_log(instance, LOG_INFO, "PPSCONTROL set, but not implemented (not M12)"); + } + instance->pps_control_msg_seen = -2; + } + /* check the antenna (did it get unplugged) and almanac (is it ready) for changes. */ oncore_check_almanac(instance); @@ -2030,9 +2196,9 @@ oncore_msg_BaEaHa( /* if not, message out */ if (instance->chan != 12 && !instance->saw_At) { - cp = "Not Good, no @@At command (no Position Hold), must be a GT/GT+"; - record_clock_stats(&(instance->peer->srcadr), cp); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Av1, sizeof(oncore_cmd_Av1)); + oncore_log(instance, LOG_NOTICE, + "Not Good, no @@At command (no Position Hold), must be a GT/GT+"); + oncore_sendmsg(instance, oncore_cmd_Av1, sizeof(oncore_cmd_Av1)); } /* have an Almanac, can start the SiteSurvey @@ -2046,35 +2212,33 @@ oncore_msg_BaEaHa( case 1: /* Use given Position */ case 3: instance->site_survey = ONCORE_SS_DONE; - cp = "SSstate = ONCORE_SS_DONE"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "SSstate = ONCORE_SS_DONE"); break; case 2: case 4: /* Site Survey */ - cp = "SSstate = ONCORE_SS_TESTING"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "SSstate = ONCORE_SS_TESTING"); instance->site_survey = ONCORE_SS_TESTING; instance->count1 = 1; if (instance->chan == 12) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Gd3, sizeof(oncore_cmd_Gd3)); /* M12+T */ + oncore_sendmsg(instance, oncore_cmd_Gd3, sizeof(oncore_cmd_Gd3)); /* M12+T */ else - oncore_sendmsg(instance->ttyfd, oncore_cmd_At2, sizeof(oncore_cmd_At2)); /* not GT, arg not VP */ + oncore_sendmsg(instance, oncore_cmd_At2, sizeof(oncore_cmd_At2)); /* not GT, arg not VP */ break; } /* Read back PPS Offset for Output */ /* Nb. This will fail silently for early UT (no plus) and M12 models */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ayx, sizeof(oncore_cmd_Ayx)); + oncore_sendmsg(instance, oncore_cmd_Ayx, sizeof(oncore_cmd_Ayx)); /* Read back Cable Delay for Output */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Azx, sizeof(oncore_cmd_Azx)); + oncore_sendmsg(instance, oncore_cmd_Azx, sizeof(oncore_cmd_Azx)); /* Read back Satellite Mask Angle for Output */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Agx, sizeof(oncore_cmd_Agx)); + oncore_sendmsg(instance, oncore_cmd_Agx, sizeof(oncore_cmd_Agx)); } @@ -2091,13 +2255,13 @@ oncore_msg_BaEaHa( if (instance->count1++ > 5 || instance->BEHa[130]&0x10) { instance->count1 = 0; if (instance->BEHa[130]&0x10) { - record_clock_stats(&(instance->peer->srcadr), + oncore_log(instance, LOG_NOTICE, "Initiating hardware 3D site survey"); - record_clock_stats(&(instance->peer->srcadr), "SSstate = ONCORE_SS_HW"); + oncore_log(instance, LOG_NOTICE, "SSstate = ONCORE_SS_HW"); instance->site_survey = ONCORE_SS_HW; } else { - record_clock_stats(&(instance->peer->srcadr), "SSstate = ONCORE_SS_SW"); + oncore_log(instance, LOG_NOTICE, "SSstate = ONCORE_SS_SW"); instance->site_survey = ONCORE_SS_SW; } } @@ -2124,19 +2288,19 @@ oncore_msg_BaEaHa( * We will have to do it ourselves (done above) */ - sprintf(Msg, "Initiating software 3D site survey (%d samples)", - POS_HOLD_AVERAGE); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_INFO, + "Initiating software 3D site survey (%d samples)", + POS_HOLD_AVERAGE); - record_clock_stats(&(instance->peer->srcadr), "SSstate = ONCORE_SS_SW"); + oncore_log(instance, LOG_NOTICE, "SSstate = ONCORE_SS_SW"); instance->site_survey = ONCORE_SS_SW; instance->ss_lat = instance->ss_long = instance->ss_ht = 0; if (instance->chan == 12) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Gd0, sizeof(oncore_cmd_Gd0)); /* disable */ + oncore_sendmsg(instance, oncore_cmd_Gd0, sizeof(oncore_cmd_Gd0)); /* disable */ else { - oncore_sendmsg(instance->ttyfd, oncore_cmd_At0, sizeof(oncore_cmd_At0)); /* disable */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Av0, sizeof(oncore_cmd_Av0)); /* disable */ + oncore_sendmsg(instance, oncore_cmd_At0, sizeof(oncore_cmd_At0)); /* disable */ + oncore_sendmsg(instance, oncore_cmd_Av0, sizeof(oncore_cmd_Av0)); /* disable */ } } } @@ -2208,7 +2372,7 @@ oncore_msg_BaEaHa( instance->traim = 0; instance->traim_delay = 0; cp = "ONCORE: Did not detect TRAIM response, TRAIM = OFF"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_INFO, cp); oncore_set_traim(instance); } else @@ -2249,8 +2413,7 @@ oncore_msg_BaEaHa( /* if not, and non-zero offset, zero the offset, and send message */ if (!instance->saw_Ay && instance->offset) { - cp = "No @@Ay command, PPS OFFSET ignored"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_INFO, "No @@Ay command, PPS OFFSET ignored"); instance->offset = 0; } } @@ -2284,11 +2447,10 @@ oncore_msg_Bd( size_t len ) { - char Msg[160]; - - sprintf(Msg, "Bd: Almanac %s, week = %d, t = %d, %d SVs: %x", - ((buf[4]) ? "LOADED" : "(NONE)"), buf[5], buf[6], buf[7], w32(&buf[8]) ); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_NOTICE, + "Bd: Almanac %s, week = %d, t = %d, %d SVs: %x", + ((buf[4]) ? "LOADED" : "(NONE)"), buf[5], buf[6], + buf[7], w32(&buf[8])); } @@ -2313,6 +2475,8 @@ oncore_msg_Bj( { const char *cp; + instance->saw_Bj = 1; + switch(buf[4]) { case 1: instance->pp->leap = LEAP_ADDSECOND; @@ -2328,12 +2492,134 @@ oncore_msg_Bj( cp = "Set pp.leap to LEAP_NOWARNING"; break; } - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, cp); } static void +oncore_msg_Bl( + struct instance *instance, + u_char *buf, + size_t len + ) +{ + int subframe, valid, page, i, j, tow; + int day_now, day_lsf; + const char *cp; + enum { + WARN_NOT_YET, + WARN_0, + WARN_PLUS, + WARN_MINUS + } warn; + + day_now = day_lsf = 0; + cp = NULL; /* keep gcc happy */ + + subframe = buf[6] & 017; + valid = (buf[6] >> 4) & 017; + page = buf[7]; + + if ((!instance->Bl.lsf_flg && !instance->Bl.wn_flg) && (subframe == 4 && page == 18 && valid == 10)) { + instance->Bl.dt_ls = buf[32]; + instance->Bl.WN_lsf = buf[33]; + instance->Bl.DN_lsf = buf[34]; + instance->Bl.dt_lsf = buf[35]; + instance->Bl.lsf_flg++; + } + if ((instance->Bl.lsf_flg && !instance->Bl.wn_flg) && (subframe == 1 && valid == 10)) { + i = (buf[7+7]<<8) + buf[7+8]; + instance->Bl.WN = i >> 6; + tow = (buf[7+4]<<16) + (buf[7+5]<<8) + buf[7+6]; + tow >>= 7; + tow = tow & 0377777; + tow <<= 2; + instance->Bl.DN = tow/57600L + 1; + instance->Bl.wn_flg++; + } + if (instance->Bl.wn_flg && instance->Bl.lsf_flg) { + instance->Bl.wn_flg = instance->Bl.lsf_flg = 0; + oncore_cmd_Bl[2] = 0; + oncore_sendmsg(instance, oncore_cmd_Bl, sizeof oncore_cmd_Bl); + oncore_cmd_Bl[2] = 1; + + i = instance->Bl.WN&01400; + instance->Bl.WN_lsf |= i; + + /* have everything I need, doit */ + + i = (instance->Bl.WN_lsf - instance->Bl.WN); + if (i < 0) + i += 1024; + day_now = instance->Bl.DN; + day_lsf = 7*i + instance->Bl.DN_lsf; + + /* ignore if in past or more than a month in future */ + + warn = WARN_NOT_YET; + if (day_lsf >= day_now && day_lsf - day_now < 32) { + /* if < 28d, doit, if 28-31, ck day-of-month < 20 (not at end of prev month) */ + if (day_lsf - day_now < 28 || instance->BEHa[5] < 20) { + i = instance->Bl.dt_lsf - instance->Bl.dt_ls; + switch (i) { + case -1: + warn = WARN_MINUS; + break; + case 0: + warn = WARN_0; + break; + case 1: + warn = WARN_PLUS; + break; + } + } + } + + switch (warn) { + case WARN_0: + case WARN_NOT_YET: + instance->peer->leap = LEAP_NOWARNING; + cp = "Set peer.leap to LEAP_NOWARNING"; + break; + case WARN_MINUS: + instance->peer->leap = LEAP_DELSECOND; + cp = "Set peer.leap to LEAP_DELSECOND"; + break; + case WARN_PLUS: + instance->peer->leap = LEAP_ADDSECOND; + cp = "Set peer.leap to LEAP_ADDSECOND"; + break; + } + oncore_log(instance, LOG_NOTICE, cp); + + i = instance->Bl.dt_lsf-instance->Bl.dt_ls; + if (i) { + j = (i >= 0) ? i : -i; /* abs(i) */ + oncore_log_f(instance, LOG_NOTICE, + "see Leap_Second (%c%d) in %d days", + ((i >= 0) ? '+' : '-'), j, + day_lsf-day_now); + } + } + +/* + * Reg only wants the following output for "deeper" driver debugging. + * See Bug 2142 and Bug 1866 + */ +#if 0 + oncore_log_f(instance, LOG_DEBUG, + "dt_ls = %d dt_lsf = %d WN = %d DN = %d WN_lsf = %d DNlsf = %d wn_flg = %d lsf_flg = %d Bl_day = %d", + instance->Bl.dt_ls, instance->Bl.dt_lsf, + instance->Bl.WN, instance->Bl.DN, + instance->Bl.WN_lsf, instance->Bl.DN_lsf, + instance->Bl.wn_flg, instance->Bl.lsf_flg, + instance->Bl.Bl_day); +#endif +} + + +static void oncore_msg_BnEnHn( struct instance *instance, u_char *buf, @@ -2341,7 +2627,6 @@ oncore_msg_BnEnHn( ) { long dt1, dt2; - char *cp; if (instance->o_state != ONCORE_RUN) return; @@ -2349,8 +2634,7 @@ oncore_msg_BnEnHn( if (instance->traim_delay) { /* flag that @@Bn/@@En/Hn returned */ instance->traim_ck = 1; instance->traim_delay = 0; - cp = "ONCORE: Detected TRAIM, TRAIM = ON"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "ONCORE: Detected TRAIM, TRAIM = ON"); oncore_set_traim(instance); } @@ -2363,8 +2647,10 @@ oncore_msg_BnEnHn( /* If Time RAIM doesn't like it, don't trust it */ if (buf[2] == 'H') { - if (instance->BEHn[6]) /* bad TRAIM */ + if (instance->BEHn[6]) { /* bad TRAIM */ + oncore_log(instance, LOG_WARNING, "BAD TRAIM"); return; + } dt1 = instance->saw_tooth + instance->offset; /* dt this time step */ instance->saw_tooth = (s_char) instance->BEHn[14]; /* update for next time Hn[14] */ @@ -2406,7 +2692,6 @@ oncore_msg_CaFaIa( size_t len ) { - char *cp; int i; if (instance->o_state == ONCORE_TEST_SENT) { @@ -2414,12 +2699,16 @@ oncore_msg_CaFaIa( instance->timeout = 0; -#ifdef DEBUG +#if ONCORE_VERBOSE_SELF_TEST if (debug > 2) { if (buf[2] == 'I') - printf("ONCORE[%d]: >>@@%ca %x %x %x\n", instance->unit, buf[2], buf[4], buf[5], buf[6]); + oncore_log_f(instance, LOG_DEBUG, + ">>@@%ca %x %x %x", buf[2], + buf[4], buf[5], buf[6]); else - printf("ONCORE[%d]: >>@@%ca %x %x\n", instance->unit, buf[2], buf[4], buf[5]); + oncore_log_f(instance, LOG_DEBUG, + ">>@@%ca %x %x", buf[2], + buf[4], buf[5]); } #endif @@ -2429,15 +2718,17 @@ oncore_msg_CaFaIa( i = buf[4] || buf[5]; if (buf[2] == 'I') i = i || buf[6]; if (i) { - if (buf[2] == 'I') { - msyslog(LOG_ERR, "ONCORE[%d]: self test failed: result %02x %02x %02x", - instance->unit, buf[4], buf[5], buf[6]); - } else { - msyslog(LOG_ERR, "ONCORE[%d]: self test failed: result %02x %02x", - instance->unit, buf[4], buf[5]); - } - cp = "ONCORE: self test failed, shutting down driver"; - record_clock_stats(&instance->peer->srcadr, cp); + if (buf[2] == 'I') + oncore_log_f(instance, LOG_ERR, + "self test failed: result %02x %02x %02x", + buf[4], buf[5], buf[6]); + else + oncore_log_f(instance, LOG_ERR, + "self test failed: result %02x %02x", + buf[4], buf[5]); + + oncore_log(instance, LOG_ERR, + "ONCORE: self test failed, shutting down driver"); refclock_report(instance->peer, CEVNT_FAULT); oncore_shutdown(instance->unit, instance->peer); @@ -2449,11 +2740,10 @@ oncore_msg_CaFaIa( oncore_antenna_report(instance, antenna); instance->o_state = ONCORE_INIT; - cp = "state = ONCORE_INIT"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "state = ONCORE_INIT"); instance->timeout = 4; - oncore_sendmsg(instance->ttyfd, oncore_cmd_Cj, sizeof(oncore_cmd_Cj)); + oncore_sendmsg(instance, oncore_cmd_Cj, sizeof(oncore_cmd_Cj)); } } @@ -2484,10 +2774,7 @@ oncore_msg_Cb( else if (buf[4] == 4 && buf[5] == 25) i = 34; else { - char *cp; - - cp = "Cb: Response is NO ALMANAC"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "Cb: Response is NO ALMANAC"); return; } @@ -2495,12 +2782,9 @@ oncore_msg_Cb( instance->shmem[instance->shmem_Cb + i + 2]++; memcpy(instance->shmem + instance->shmem_Cb + i + 3, buf, (size_t) (len + 3)); -#if 1 - { - char Msg[160]; - sprintf(Msg, "See Cb [%d,%d]", buf[4], buf[5]); - record_clock_stats(&(instance->peer->srcadr), Msg); - } +#ifdef ONCORE_VERBOSE_MSG_CB + oncore_log_f(instance, LOG_DEBUG, "See Cb [%d,%d]", buf[4], + buf[5]); #endif } @@ -2518,16 +2802,13 @@ oncore_msg_Cf( size_t len ) { - const char *cp; - if (instance->o_state == ONCORE_RESET_SENT) { - oncore_sendmsg(instance->ttyfd, oncore_cmd_Cg, sizeof(oncore_cmd_Cg)); /* Return to Posn Fix mode */ + oncore_sendmsg(instance, oncore_cmd_Cg, sizeof(oncore_cmd_Cg)); /* Return to Posn Fix mode */ /* Reset set VP to IDLE */ instance->o_state = ONCORE_TEST_SENT; - cp = "state = ONCORE_TEST_SENT"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "state = ONCORE_TEST_SENT"); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Cj, sizeof(oncore_cmd_Cj)); + oncore_sendmsg(instance, oncore_cmd_Cj, sizeof(oncore_cmd_Cj)); } } @@ -2556,7 +2837,6 @@ oncore_msg_Cj( ) { int mode; - char *cp; memcpy(instance->Cj, buf, len); @@ -2568,23 +2848,21 @@ oncore_msg_Cj( mode = instance->init_type; if (mode == 3 || mode == 4) { /* Cf will return here to check for TEST */ instance->o_state = ONCORE_RESET_SENT; - cp = "state = ONCORE_RESET_SENT"; - record_clock_stats(&(instance->peer->srcadr), cp); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Cf, sizeof(oncore_cmd_Cf)); + oncore_log(instance, LOG_NOTICE, "state = ONCORE_RESET_SENT"); + oncore_sendmsg(instance, oncore_cmd_Cf, sizeof(oncore_cmd_Cf)); } else { instance->o_state = ONCORE_TEST_SENT; - cp = "state = ONCORE_TEST_SENT"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "state = ONCORE_TEST_SENT"); } } if (instance->o_state == ONCORE_TEST_SENT) { if (instance->chan == 6) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ca, sizeof(oncore_cmd_Ca)); + oncore_sendmsg(instance, oncore_cmd_Ca, sizeof(oncore_cmd_Ca)); else if (instance->chan == 8) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Fa, sizeof(oncore_cmd_Fa)); + oncore_sendmsg(instance, oncore_cmd_Fa, sizeof(oncore_cmd_Fa)); else if (instance->chan == 12) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ia, sizeof(oncore_cmd_Ia)); + oncore_sendmsg(instance, oncore_cmd_Ia, sizeof(oncore_cmd_Ia)); } else if (instance->o_state == ONCORE_INIT) oncore_msg_Cj_init(instance, buf, len); } @@ -2610,19 +2888,20 @@ oncore_msg_Cj_id( size_t len ) { - char *cp, *cp1, *cp2, Model[21], Msg[160]; + char *cp2, Model[21]; + const char *cp, *cp1; /* Write Receiver ID message to clockstats file */ instance->Cj[294] = '\0'; - for (cp=(char *)instance->Cj; cp< (char *) &instance->Cj[294]; ) { - cp1 = strchr(cp, '\r'); - if (!cp1) - cp1 = (char *)&instance->Cj[294]; - *cp1 = '\0'; - record_clock_stats(&(instance->peer->srcadr), cp); - *cp1 = '\r'; - cp = cp1+2; + for (cp= (char *)instance->Cj; cp< (char *) &instance->Cj[294]; ) { + char *cpw = strchr(cp, '\r'); + if (!cpw) + cpw = (char *)&instance->Cj[294]; + *cpw = '\0'; + oncore_log(instance, LOG_NOTICE, cp); + *cpw = '\r'; + cp = cpw+2; } /* next, the Firmware Version and Revision numbers */ @@ -2637,7 +2916,7 @@ oncore_msg_Cj_id( ; cp1 = cp; cp2 = Model; - for (; !isspace((int)*cp) && cp-cp1 < 20; cp++, cp2++) + for (; !isspace((unsigned char)*cp) && cp-cp1 < 20; cp++, cp2++) *cp2 = *cp; *cp2 = '\0'; @@ -2681,8 +2960,9 @@ oncore_msg_Cj_id( /* use MODEL to set CHAN and TRAIM and possibly zero SHMEM */ - sprintf(Msg, "This looks like an Oncore %s with version %d.%d firmware.", cp, instance->version, instance->revision); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_INFO, + "This looks like an Oncore %s with version %d.%d firmware.", + cp, instance->version, instance->revision); instance->chan_id = 8; /* default */ if (instance->model == ONCORE_BASIC || instance->model == ONCORE_PVT6) @@ -2700,9 +2980,13 @@ oncore_msg_Cj_id( else if (instance->model == ONCORE_M12) instance->traim_id = -1; - sprintf(Msg, "Channels = %d, TRAIM = %s", instance->chan_id, - ((instance->traim_id < 0) ? "UNKNOWN" : ((instance->traim_id > 0) ? "ON" : "OFF"))); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_INFO, "Channels = %d, TRAIM = %s", + instance->chan_id, + ((instance->traim_id < 0) + ? "UNKNOWN" + : (instance->traim_id > 0) + ? "ON" + : "OFF")); } @@ -2720,8 +3004,7 @@ oncore_msg_Cj_init( size_t len ) { - char *cp, Msg[160]; - u_char Cmd[20]; + u_char Cmd[20]; int mode; @@ -2733,17 +3016,18 @@ oncore_msg_Cj_init( if (instance->chan == 12) { instance->shmem_bad_Ea = 1; - sprintf(Msg, "*** SHMEM partially enabled for ONCORE M12 s/w v%d.%d ***", instance->version, instance->revision); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_NOTICE, + "*** SHMEM partially enabled for ONCORE M12 s/w v%d.%d ***", + instance->version, instance->revision); } - oncore_sendmsg(instance->ttyfd, oncore_cmd_Cg, sizeof(oncore_cmd_Cg)); /* Return to Posn Fix mode */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Bb, sizeof(oncore_cmd_Bb)); /* turn on for shmem (6/8/12) */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ek, sizeof(oncore_cmd_Ek)); /* turn off (VP) */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Aw, sizeof(oncore_cmd_Aw)); /* UTC time (6/8/12) */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_AB, sizeof(oncore_cmd_AB)); /* Appl type static (VP) */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Be, sizeof(oncore_cmd_Be)); /* Tell us the Almanac for shmem (6/8/12) */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Bd, sizeof(oncore_cmd_Bd)); /* Tell us when Almanac changes */ + oncore_sendmsg(instance, oncore_cmd_Cg, sizeof(oncore_cmd_Cg)); /* Return to Posn Fix mode */ + oncore_sendmsg(instance, oncore_cmd_Bb, sizeof(oncore_cmd_Bb)); /* turn on for shmem (6/8/12) */ + oncore_sendmsg(instance, oncore_cmd_Ek, sizeof(oncore_cmd_Ek)); /* turn off (VP) */ + oncore_sendmsg(instance, oncore_cmd_Aw, sizeof(oncore_cmd_Aw)); /* UTC time (6/8/12) */ + oncore_sendmsg(instance, oncore_cmd_AB, sizeof(oncore_cmd_AB)); /* Appl type static (VP) */ + oncore_sendmsg(instance, oncore_cmd_Be, sizeof(oncore_cmd_Be)); /* Tell us the Almanac for shmem (6/8/12) */ + oncore_sendmsg(instance, oncore_cmd_Bd, sizeof(oncore_cmd_Bd)); /* Tell us when Almanac changes */ mode = instance->init_type; @@ -2753,31 +3037,29 @@ oncore_msg_Cj_init( */ if (instance->posn_set) { - record_clock_stats(&(instance->peer->srcadr), "Setting Posn from input data"); + oncore_log(instance, LOG_INFO, "Setting Posn from input data"); oncore_set_posn(instance); /* this should print posn indirectly thru the As cmd */ } else /* must issue an @@At here to check on 6/8 Position Hold, set_posn would have */ if (instance->chan != 12) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Atx, sizeof(oncore_cmd_Atx)); + oncore_sendmsg(instance, oncore_cmd_Atx, sizeof(oncore_cmd_Atx)); if (mode != 0) { /* cable delay in ns */ memcpy(Cmd, oncore_cmd_Az, (size_t) sizeof(oncore_cmd_Az)); - w32_buf(&Cmd[-2+4], instance->delay); - oncore_sendmsg(instance->ttyfd, Cmd, sizeof(oncore_cmd_Az)); /* 6,8,12 */ + w32_buf(&Cmd[-2+4], (int)instance->delay); + oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_Az)); /* 6,8,12 */ /* PPS offset in ns */ - if (instance->offset) { - memcpy(Cmd, oncore_cmd_Ay, (size_t) sizeof(oncore_cmd_Ay)); /* some have it, some don't */ - w32_buf(&Cmd[-2+4], instance->offset); /* will check for hw response */ - oncore_sendmsg(instance->ttyfd, Cmd, sizeof(oncore_cmd_Ay)); - } + memcpy(Cmd, oncore_cmd_Ay, (size_t) sizeof(oncore_cmd_Ay)); /* some have it, some don't */ + w32_buf(&Cmd[-2+4], instance->offset); /* will check for hw response */ + oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_Ay)); /* Satellite mask angle */ if (instance->Ag != 0xff) { /* will have 0xff in it if not set by user */ memcpy(Cmd, oncore_cmd_Ag, (size_t) sizeof(oncore_cmd_Ag)); Cmd[-2+4] = instance->Ag; - oncore_sendmsg(instance->ttyfd, Cmd, sizeof(oncore_cmd_Ag)); + oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_Ag)); } } @@ -2789,29 +3071,30 @@ oncore_msg_Cj_init( */ if (instance->chan == 6) { /* start 6chan, kill 8,12chan commands, possibly testing VP in 6chan mode */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ea0, sizeof(oncore_cmd_Ea0)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_En0, sizeof(oncore_cmd_En0)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ha0, sizeof(oncore_cmd_Ha0)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Hn0, sizeof(oncore_cmd_Hn0)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ba, sizeof(oncore_cmd_Ba )); + oncore_sendmsg(instance, oncore_cmd_Ea0, sizeof(oncore_cmd_Ea0)); + oncore_sendmsg(instance, oncore_cmd_En0, sizeof(oncore_cmd_En0)); + oncore_sendmsg(instance, oncore_cmd_Ha0, sizeof(oncore_cmd_Ha0)); + oncore_sendmsg(instance, oncore_cmd_Hn0, sizeof(oncore_cmd_Hn0)); + oncore_sendmsg(instance, oncore_cmd_Ba, sizeof(oncore_cmd_Ba )); } else if (instance->chan == 8) { /* start 8chan, kill 6,12chan commands */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ba0, sizeof(oncore_cmd_Ba0)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Bn0, sizeof(oncore_cmd_Bn0)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ha0, sizeof(oncore_cmd_Ha0)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Hn0, sizeof(oncore_cmd_Hn0)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ea, sizeof(oncore_cmd_Ea )); + oncore_sendmsg(instance, oncore_cmd_Ba0, sizeof(oncore_cmd_Ba0)); + oncore_sendmsg(instance, oncore_cmd_Bn0, sizeof(oncore_cmd_Bn0)); + oncore_sendmsg(instance, oncore_cmd_Ha0, sizeof(oncore_cmd_Ha0)); + oncore_sendmsg(instance, oncore_cmd_Hn0, sizeof(oncore_cmd_Hn0)); + oncore_sendmsg(instance, oncore_cmd_Ea, sizeof(oncore_cmd_Ea )); } else if (instance->chan == 12){ /* start 12chan, kill 6,12chan commands */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ba0, sizeof(oncore_cmd_Ba0)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Bn0, sizeof(oncore_cmd_Bn0)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ea0, sizeof(oncore_cmd_Ea0)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_En0, sizeof(oncore_cmd_En0)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ha, sizeof(oncore_cmd_Ha )); + oncore_sendmsg(instance, oncore_cmd_Ba0, sizeof(oncore_cmd_Ba0)); + oncore_sendmsg(instance, oncore_cmd_Bn0, sizeof(oncore_cmd_Bn0)); + oncore_sendmsg(instance, oncore_cmd_Ea0, sizeof(oncore_cmd_Ea0)); + oncore_sendmsg(instance, oncore_cmd_En0, sizeof(oncore_cmd_En0)); + oncore_sendmsg(instance, oncore_cmd_Ha, sizeof(oncore_cmd_Ha )); + oncore_cmd_Gc[2] = (instance->pps_control < 0) ? 1 : instance->pps_control; + oncore_sendmsg(instance, oncore_cmd_Gc, sizeof(oncore_cmd_Gc)); /* PPS off/continuous/Tracking 1+sat/TRAIM */ } instance->count = 1; instance->o_state = ONCORE_ALMANAC; - cp = "state = ONCORE_ALMANAC"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "state = ONCORE_ALMANAC"); } @@ -2825,7 +3108,6 @@ oncore_msg_Ga( size_t len ) { - char Msg[160]; long lat, lon, ht; double Lat, Lon, Ht; @@ -2842,9 +3124,9 @@ oncore_msg_Ga( Lon /= 3600000; Ht /= 100; - - sprintf(Msg, "Ga Posn Lat = %.7f, Lon = %.7f, Ht = %.2f", Lat, Lon, Ht); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_NOTICE, + "Ga Posn Lat = %.7f, Lon = %.7f, Ht = %.2f", Lat, + Lon, Ht); instance->ss_lat = lat; instance->ss_long = lon; @@ -2864,7 +3146,7 @@ oncore_msg_Gb( size_t len ) { - char Msg[160], *gmts; + const char * gmts; int mo, d, y, h, m, s, gmth, gmtm; mo = buf[4]; @@ -2879,9 +3161,27 @@ oncore_msg_Gb( gmth = buf[12]; gmtm = buf[13]; - sprintf(Msg, "Date/Time set to: %d%s%d %2d:%02d:%02d GMT (GMT offset is %s%02d:%02d)", - d, Month[mo-1], y, h, m, s, gmts, gmth, gmtm); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_NOTICE, + "Date/Time set to: %d%s%d %2d:%02d:%02d GMT (GMT offset is %s%02d:%02d)", + d, months[mo-1], y, h, m, s, gmts, gmth, gmtm); +} + + + +/* Response to PPS Control message (M12 and M12+T only ) */ + +static void +oncore_msg_Gc( + struct instance *instance, + u_char *buf, + size_t len + ) +{ + const char *tbl[] = {"OFF", "ON", "SATELLITE", "TRAIM" }; + + instance->pps_control_msg_seen = 1; + oncore_log_f(instance, LOG_INFO, "PPS Control set to %s", + tbl[buf[4]]); } @@ -2896,8 +3196,13 @@ oncore_msg_Gj( size_t len ) { + static const char * insrem[2] = { + "removed", + "inserted" + }; + int dt; - char Msg[160], *cp; + const char *cp; instance->saw_Gj = 1; /* flag, saw_Gj, dont need to try Bj in check_leap */ @@ -2905,21 +3210,32 @@ oncore_msg_Gj( dt = buf[5] - buf[4]; -#if 1 - sprintf(Msg, "ONCORE[%d]: Leap Sec Msg: %d %d %d %d %d %d %d %d %d %d", - instance->unit, - buf[4], buf[5], 256*buf[6]+buf[7], buf[8], buf[9], buf[10], - (buf[14]+256*(buf[13]+256*(buf[12]+256*buf[11]))), - buf[15], buf[16], buf[17]); - record_clock_stats(&(instance->peer->srcadr), Msg); -#endif - if (dt) { - sprintf(Msg, "ONCORE[%d]: Leap second (%d) scheduled for %d%s%d at %d:%d:%d", - instance->unit, - dt, buf[9], Month[buf[8]-1], 256*buf[6]+buf[7], - buf[15], buf[16], buf[17]); - record_clock_stats(&(instance->peer->srcadr), Msg); - } + oncore_log_f(instance, LOG_INFO, + "Leap Sec Msg: %d %d %d %d %d %d %d %d %d %d", + buf[4], buf[5], 256 * buf[6] + buf[7], buf[8], + buf[9], buf[10], + (buf[14] + 256 * + (buf[13] + 256 * (buf[12] + 256 * buf[11]))), + buf[15], buf[16], buf[17]); + + /* There seems to be eternal confusion about when a leap second + * takes place. It's the second *before* the new TAI offset + * becomes effective. But since the ONCORE receiver tells us + * just that, we would have to do some time/date calculations to + * get the actual leap second -- that is, the one that is + * deleted or inserted. + * + * Going through all this for a simple log is probably overkill, + * so for fixing bug#1050 the message output is changed to + * reflect the fact that it tells the second after the leap + * second. + */ + if (dt) + oncore_log_f(instance, LOG_NOTICE, + "Leap second %s (%d) before %04u-%02u-%02u/%02u:%02u:%02u", + insrem[(dt > 0)], dt, + 256u * buf[6] + buf[7], buf[8], buf[9], + buf[15], buf[16], buf[17]); /* Only raise warning within a month of the leap second */ @@ -2938,7 +3254,7 @@ oncore_msg_Gj( } } } - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_INFO, cp); } @@ -2952,11 +3268,8 @@ oncore_msg_Sz( size_t len ) { - const char *cp; - - cp = "Oncore: System Failure at Power On"; if (instance && instance->peer) { - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_ERR, "Oncore: System Failure at Power On"); oncore_shutdown(instance->unit, instance->peer); } } @@ -2969,7 +3282,7 @@ oncore_antenna_report( struct instance *instance, enum antenna_state new_state) { - char *cp; + const char *cp; if (instance->ant_state == new_state) return; @@ -2983,7 +3296,7 @@ oncore_antenna_report( } instance->ant_state = new_state; - record_clock_stats(&instance->peer->srcadr, cp); + oncore_log(instance, LOG_NOTICE, cp); } @@ -2993,8 +3306,6 @@ oncore_chan_test( struct instance *instance ) { - char *cp; - /* subroutine oncore_Cj_id has determined the number of channels from the * model number of the attached oncore. This is not always correct since * the oncore could have non-standard firmware. Here we check (independently) by @@ -3005,13 +3316,12 @@ oncore_chan_test( */ instance->o_state = ONCORE_CHECK_CHAN; - cp = "state = ONCORE_CHECK_CHAN"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "state = ONCORE_CHECK_CHAN"); instance->count3 = 1; - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ba, sizeof(oncore_cmd_Ba)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ea, sizeof(oncore_cmd_Ea)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ha, sizeof(oncore_cmd_Ha)); + oncore_sendmsg(instance, oncore_cmd_Ba, sizeof(oncore_cmd_Ba)); + oncore_sendmsg(instance, oncore_cmd_Ea, sizeof(oncore_cmd_Ea)); + oncore_sendmsg(instance, oncore_cmd_Ha, sizeof(oncore_cmd_Ha)); } @@ -3040,20 +3350,20 @@ oncore_check_almanac( bits3 = instance->BEHa[141]; /* UTC parameters */ if (!instance->count5_set && (bits3 & 0xC0)) { - instance->count5 = 2; + instance->count5 = 4; /* was 2 [Bug 1766] */ instance->count5_set = 1; } -#if 0 -{ - char Msg[160]; - - sprintf(Msg, "ONCORE[%d]: DEBUG BITS: (%x %x), (%x %x %x), %x %x %x %x %x\n", - instance->unit, - instance->BEHa[129], instance->BEHa[130], bits1, bits2, bits3, instance->mode == MODE_0D, - instance->mode == MODE_2D, instance->mode == MODE_3D, - instance->rsm.bad_almanac, instance->rsm.bad_fix); - record_clock_stats(&(instance->peer->srcadr), Msg); -} +#ifdef ONCORE_VERBOSE_CHECK_ALMANAC + oncore_log_f(instance, LOG_DEBUG, + "DEBUG BITS: (%x %x), (%x %x %x), %x %x %x %x %x", + instance->BEHa[129], instance->BEHa[130], + bits1, bits2, bits3, + instance->mode == MODE_0D, + instance->mode == MODE_2D, + instance->mode == MODE_3D, + instance->rsm.bad_almanac, + instance->rsm.bad_fix); + } #endif } } @@ -3108,19 +3418,21 @@ oncore_check_leap_sec( struct instance *instance ) { - if (instance->Bj_day != instance->BEHa[5]) { /* do this 1/day */ + oncore_cmd_Bl[2] = 1; /* just to be sure */ + if (instance->Bj_day != instance->BEHa[5]) { /* do this 1/day */ instance->Bj_day = instance->BEHa[5]; if (instance->saw_Gj < 0) { /* -1 DONT have Gj use Bj */ if ((instance->BEHa[4] == 6) || (instance->BEHa[4] == 12)) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Bj, sizeof(oncore_cmd_Bj)); + oncore_sendmsg(instance, oncore_cmd_Bj, sizeof(oncore_cmd_Bj)); + oncore_sendmsg(instance, oncore_cmd_Bl, sizeof(oncore_cmd_Bl)); return; } if (instance->saw_Gj == 0) /* 0 is dont know if we have Gj */ instance->count4 = 1; - oncore_sendmsg(instance->ttyfd, oncore_cmd_Gj, sizeof(oncore_cmd_Gj)); + oncore_sendmsg(instance, oncore_cmd_Gj, sizeof(oncore_cmd_Gj)); return; } @@ -3134,8 +3446,10 @@ oncore_check_leap_sec( else if (instance->count4++ > 5) { /* delay, waiting for Gj response */ instance->saw_Gj = -1; /* didnt see it, will use Bj */ instance->count4 = 0; - if ((instance->BEHa[4] == 6) || (instance->BEHa[4] == 12)) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Bj, sizeof(oncore_cmd_Bj)); + if ((instance->BEHa[4] == 6) || (instance->BEHa[4] == 12)) { + oncore_sendmsg(instance, oncore_cmd_Bj, sizeof(oncore_cmd_Bj)); + oncore_sendmsg(instance, oncore_cmd_Bl, sizeof(oncore_cmd_Bl)); + } } } } @@ -3170,7 +3484,6 @@ oncore_compute_dH( ) { int GPS, MSL; - char Msg[160]; /* Here calculate dH = GPS - MSL for output message */ /* also set Altitude Hold mode if GT */ @@ -3188,10 +3501,9 @@ oncore_compute_dH( /* if MSL is not set, the calculation is meaningless */ - if (MSL) { /* not set ! */ - sprintf(Msg, "dH = (GPS - MSL) = %.2fm", instance->dH); - record_clock_stats(&(instance->peer->srcadr), Msg); - } + if (MSL) /* not set ! */ + oncore_log_f(instance, LOG_INFO, + "dH = (GPS - MSL) = %.2fm", instance->dH); } @@ -3213,44 +3525,40 @@ oncore_load_almanac( if (!instance->shmem) return; -#if 1 - for (cp=instance->shmem+4; (n = 256*(*(cp-3)) + *(cp-2)); cp+=(n+3)) { +#ifndef ONCORE_VERBOSE_LOAD_ALMANAC + for (cp = instance->shmem + 4; (n = 256 * (*(cp-3)) + *(cp-2)); + cp += (n + 3)) { if (!strncmp((char *) cp, "@@Cb", 4) && oncore_checksum_ok(cp, 33) && (*(cp+4) == 4 || *(cp+4) == 5)) { write(instance->ttyfd, cp, n); -#if 1 oncore_print_Cb(instance, cp); -#endif } } -#else -/************DEBUG************/ - for (cp=instance->shmem+4; (n = 256*(*(cp-3)) + *(cp-2)); cp+=(n+3)) { - char Msg[160]; - - sprintf(Msg, "See %c%c%c%c %d", *(cp), *(cp+1), *(cp+2), *(cp+3), *(cp+4)); - record_clock_stats(&(instance->peer->srcadr), Msg); +#else /* ONCORE_VERBOSE_LOAD_ALMANAC follows */ + for (cp = instance->shmem + 4; (n = 256 * (*(cp-3)) + *(cp-2)); + cp += (n+3)) { + oncore_log_f(instance, LOG_DEBUG, "See %c%c%c%c %d", + *(cp), *(cp+1), *(cp+2), *(cp+3), *(cp+4)); if (!strncmp(cp, "@@Cb", 4)) { oncore_print_Cb(instance, cp); if (oncore_checksum_ok(cp, 33)) { if (*(cp+4) == 4 || *(cp+4) == 5) { - record_clock_stats(&(instance->peer->srcadr), "GOOD SF"); + oncore_log(instance, LOG_DEBUG, "GOOD SF"); write(instance->ttyfd, cp, n); } else - record_clock_stats(&(instance->peer->srcadr), "BAD SF"); + oncore_log(instance, LOG_DEBUG, "BAD SF"); } else - record_clock_stats(&(instance->peer->srcadr), "BAD CHECKSUM"); + oncore_log(instance, LOG_DEBUG, "BAD CHECKSUM"); } } -/************DEBUG************/ #endif /* Must load position and time or the Almanac doesn't do us any good */ if (!instance->posn_set) { /* if we input a posn use it, else from SHMEM */ - record_clock_stats(&(instance->peer->srcadr), "Loading Posn from SHMEM"); + oncore_log(instance, LOG_NOTICE, "Loading Posn from SHMEM"); for (cp=instance->shmem+4; (n = 256*(*(cp-3)) + *(cp-2)); cp+=(n+3)) { if ((instance->chan == 6 && (!strncmp((char *) cp, "@@Ba", 4) && oncore_checksum_ok(cp, 68))) || (instance->chan == 8 && (!strncmp((char *) cp, "@@Ea", 4) && oncore_checksum_ok(cp, 76))) || @@ -3261,12 +3569,11 @@ oncore_load_almanac( ii = buf_w32(cp + 15); jj = buf_w32(cp + 19); kk = buf_w32(cp + 23); -#if 0 -{ -char Msg[160]; -sprintf(Msg, "SHMEM posn = %ld (%d, %d, %d)", (long) (cp-instance->shmem), ii, jj, kk); -record_clock_stats(&(instance->peer->srcadr), Msg); -} +#ifdef ONCORE_VERBOSE_LOAD_ALMANAC + oncore_log_f(instance, LOG_DEBUG, + "SHMEM posn = %ld (%d, %d, %d)", + (long)(cp-instance->shmem), + ii, jj, kk); #endif if (ii != 0 || jj != 0 || kk != 0) { /* phk asked for this test */ instance->ss_lat = ii; @@ -3280,15 +3587,13 @@ record_clock_stats(&(instance->peer->srcadr), Msg); /* and set time to time from Computer clock */ - gettimeofday(&tv, 0); + GETTIMEOFDAY(&tv, 0); tm = gmtime((const time_t *) &tv.tv_sec); -#if 1 - { - char Msg[160]; - sprintf(Msg, "DATE %d %d %d, %d %d %d", 1900+tm->tm_year, tm->tm_mon, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec); - record_clock_stats(&(instance->peer->srcadr), Msg); - } + +#ifdef ONCORE_VERBOSE_LOAD_ALMANAC + oncore_log_f(instance, LOG_DEBUG, "DATE %d %d %d, %d %d %d", + 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday, + tm->tm_hour, tm->tm_min, tm->tm_sec); #endif if (instance->chan == 12) { memcpy(Cmd, oncore_cmd_Gb, (size_t) sizeof(oncore_cmd_Gb)); @@ -3302,27 +3607,27 @@ record_clock_stats(&(instance->peer->srcadr), Msg); Cmd[-2+11] = 0; Cmd[-2+12] = 0; Cmd[-2+13] = 0; - oncore_sendmsg(instance->ttyfd, Cmd, sizeof(oncore_cmd_Gb)); + oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_Gb)); } else { /* First set GMT offset to zero */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ab, sizeof(oncore_cmd_Ab)); + oncore_sendmsg(instance, oncore_cmd_Ab, sizeof(oncore_cmd_Ab)); memcpy(Cmd, oncore_cmd_Ac, (size_t) sizeof(oncore_cmd_Ac)); Cmd[-2+4] = tm->tm_mon + 1; Cmd[-2+5] = tm->tm_mday; Cmd[-2+6] = (1900+tm->tm_year)/256; Cmd[-2+7] = (1900+tm->tm_year)%256; - oncore_sendmsg(instance->ttyfd, Cmd, sizeof(oncore_cmd_Ac)); + oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_Ac)); memcpy(Cmd, oncore_cmd_Aa, (size_t) sizeof(oncore_cmd_Aa)); Cmd[-2+4] = tm->tm_hour; Cmd[-2+5] = tm->tm_min; Cmd[-2+6] = tm->tm_sec; - oncore_sendmsg(instance->ttyfd, Cmd, sizeof(oncore_cmd_Aa)); + oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_Aa)); } - record_clock_stats(&(instance->peer->srcadr), "Setting Posn and Time after Loading Almanac"); + oncore_log(instance, LOG_INFO, "Setting Posn and Time after Loading Almanac"); } @@ -3335,18 +3640,23 @@ oncore_print_Cb( u_char *cp ) { -#if 0 +#ifdef ONCORE_VERBOSE_CB int ii; - char Msg[160]; + char Msg[160], Msg2[10]; + + oncore_log_f(instance, LOG_DEBUG, "DEBUG: See: %c%c%c%c", *(cp), + *(cp+1), *(cp+2), *(cp+3)); - printf("DEBUG: See: %c%c%c%c\n", *(cp), *(cp+1), *(cp+2), *(cp+3)); - printf("DEBUG: Cb: [%d,%d]", *(cp+4), *(cp+5)); - for(ii=0; ii<33; ii++) - printf(" %d", *(cp+ii)); - printf("\n"); + snprintf(Msg, sizeof(Msg), "DEBUG: Cb: [%d,%d]", *(cp+4), + *(cp+5)); + for (ii = 0; ii < 33; ii++) { + snprintf(Msg2, sizeof(Msg2), " %d", *(cp+ii)); + strlcat(Msg, Msg2, sizeof(Msg)); + } + oncore_log(instance, LOG_DEBUG, Msg); - sprintf(Msg, "Debug: Cb: [%d,%d]", *(cp+4), *(cp+5)); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_DEBUG, "Debug: Cb: [%d,%d]", *(cp+4), + *(cp+5)); #endif } @@ -3379,12 +3689,12 @@ oncore_print_posn( struct instance *instance ) { - char Msg[120], ew, ns; + char ew, ns; double xd, xm, xs, yd, ym, ys, hm, hft; int idx, idy, is, imx, imy; long lat, lon; - record_clock_stats(&(instance->peer->srcadr), "Posn:"); + oncore_log(instance, LOG_INFO, "Posn:"); ew = 'E'; lon = instance->ss_long; if (lon < 0) { @@ -3404,8 +3714,9 @@ oncore_print_posn( xd = lat/3600000.; /* lat, lon in int msec arc, ht in cm. */ yd = lon/3600000.; - sprintf(Msg, "Lat = %c %11.7fdeg, Long = %c %11.7fdeg, Alt = %5.2fm (%5.2fft) GPS", ns, xd, ew, yd, hm, hft); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_INFO, + "Lat = %c %11.7fdeg, Long = %c %11.7fdeg, Alt = %5.2fm (%5.2fft) GPS", + ns, xd, ew, yd, hm, hft); idx = xd; idy = yd; @@ -3413,9 +3724,9 @@ oncore_print_posn( imy = lon%3600000; xm = imx/60000.; ym = imy/60000.; - sprintf(Msg, - "Lat = %c %3ddeg %7.4fm, Long = %c %3ddeg %8.5fm, Alt = %7.2fm (%7.2fft) GPS", ns, idx, xm, ew, idy, ym, hm, hft); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_INFO, + "Lat = %c %3ddeg %7.4fm, Long = %c %3ddeg %8.5fm, Alt = %7.2fm (%7.2fft) GPS", + ns, idx, xm, ew, idy, ym, hm, hft); imx = xm; imy = ym; @@ -3423,9 +3734,9 @@ oncore_print_posn( xs = is/1000.; is = lon%60000; ys = is/1000.; - sprintf(Msg, - "Lat = %c %3ddeg %2dm %5.2fs, Long = %c %3ddeg %2dm %5.2fs, Alt = %7.2fm (%7.2fft) GPS", ns, idx, imx, xs, ew, idy, imy, ys, hm, hft); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_INFO, + "Lat = %c %3ddeg %2dm %5.2fs, Long = %c %3ddeg %2dm %5.2fs, Alt = %7.2fm (%7.2fft) GPS", + ns, idx, imx, xs, ew, idy, imy, ys, hm, hft); } @@ -3436,16 +3747,20 @@ oncore_print_posn( static void oncore_sendmsg( - int fd, + struct instance *instance, u_char *ptr, size_t len ) { + int fd; u_char cs = 0; -#ifdef DEBUG - if (debug > 4) - printf("ONCORE: Send @@%c%c %d\n", ptr[0], ptr[1], (int) len); + fd = instance->ttyfd; +#ifdef ONCORE_VERBOSE_SENDMSG + if (debug > 4) { + oncore_log_f(instance, LOG_DEBUG, "ONCORE: Send @@%c%c %d", + ptr[0], ptr[1], (int)len); + } #endif write(fd, "@@", (size_t) 2); write(fd, ptr, len); @@ -3469,10 +3784,10 @@ oncore_set_posn( will get set ON in @@Ea later */ if (instance->chan == 12) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Gd0, sizeof(oncore_cmd_Gd0)); /* (12) */ + oncore_sendmsg(instance, oncore_cmd_Gd0, sizeof(oncore_cmd_Gd0)); /* (12) */ else { - oncore_sendmsg(instance->ttyfd, oncore_cmd_At0, sizeof(oncore_cmd_At0)); /* (6/8) */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Av0, sizeof(oncore_cmd_Av0)); /* (6/8) */ + oncore_sendmsg(instance, oncore_cmd_At0, sizeof(oncore_cmd_At0)); /* (6/8) */ + oncore_sendmsg(instance, oncore_cmd_Av0, sizeof(oncore_cmd_Av0)); /* (6/8) */ } mode = instance->init_type; @@ -3483,12 +3798,12 @@ oncore_set_posn( w32_buf(&Cmd[-2+8], (int) instance->ss_long); w32_buf(&Cmd[-2+12], (int) instance->ss_ht); Cmd[-2+16] = 0; - oncore_sendmsg(instance->ttyfd, Cmd, sizeof(oncore_cmd_As)); /* posn hold 3D posn (6/8/12) */ + oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_As)); /* posn hold 3D posn (6/8/12) */ memcpy(Cmd, oncore_cmd_Au, (size_t) sizeof(oncore_cmd_Au)); w32_buf(&Cmd[-2+4], (int) instance->ss_ht); Cmd[-2+8] = 0; - oncore_sendmsg(instance->ttyfd, Cmd, sizeof(oncore_cmd_Au)); /* altitude hold (6/8/12 not UT, M12T) */ + oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_Au)); /* altitude hold (6/8/12 not UT, M12T) */ /* next set current position */ @@ -3498,28 +3813,28 @@ oncore_set_posn( w32_buf(&Cmd[-2+8], (int) instance->ss_long); w32_buf(&Cmd[-2+12],(int) instance->ss_ht); Cmd[-2+16] = 0; - oncore_sendmsg(instance->ttyfd, Cmd, sizeof(oncore_cmd_Ga)); /* 3d posn (12) */ + oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_Ga)); /* 3d posn (12) */ } else { memcpy(Cmd, oncore_cmd_Ad, (size_t) sizeof(oncore_cmd_Ad)); w32_buf(&Cmd[-2+4], (int) instance->ss_lat); - oncore_sendmsg(instance->ttyfd, Cmd, sizeof(oncore_cmd_Ad)); /* lat (6/8) */ + oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_Ad)); /* lat (6/8) */ memcpy(Cmd, oncore_cmd_Ae, (size_t) sizeof(oncore_cmd_Ae)); w32_buf(&Cmd[-2+4], (int) instance->ss_long); - oncore_sendmsg(instance->ttyfd, Cmd, sizeof(oncore_cmd_Ae)); /* long (6/8) */ + oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_Ae)); /* long (6/8) */ memcpy(Cmd, oncore_cmd_Af, (size_t) sizeof(oncore_cmd_Af)); w32_buf(&Cmd[-2+4], (int) instance->ss_ht); Cmd[-2+8] = 0; - oncore_sendmsg(instance->ttyfd, Cmd, sizeof(oncore_cmd_Af)); /* ht (6/8) */ + oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_Af)); /* ht (6/8) */ } /* Finally, turn on position hold */ if (instance->chan == 12) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Gd1, sizeof(oncore_cmd_Gd1)); + oncore_sendmsg(instance, oncore_cmd_Gd1, sizeof(oncore_cmd_Gd1)); else - oncore_sendmsg(instance->ttyfd, oncore_cmd_At1, sizeof(oncore_cmd_At1)); + oncore_sendmsg(instance, oncore_cmd_At1, sizeof(oncore_cmd_At1)); } } @@ -3530,32 +3845,30 @@ oncore_set_traim( struct instance *instance ) { - char Msg[160]; - if (instance->traim_in != -1) /* set in Input */ instance->traim = instance->traim_in; else instance->traim = instance->traim_ck; - sprintf(Msg, "Input says TRAIM = %d", instance->traim_in); - record_clock_stats(&(instance->peer->srcadr), Msg); - sprintf(Msg, "Model # says TRAIM = %d", instance->traim_id); - record_clock_stats(&(instance->peer->srcadr), Msg); - sprintf(Msg, "Testing says TRAIM = %d", instance->traim_ck); - record_clock_stats(&(instance->peer->srcadr), Msg); - sprintf(Msg, "Using TRAIM = %d", instance->traim); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_INFO, "Input says TRAIM = %d", + instance->traim_in); + oncore_log_f(instance, LOG_INFO, "Model # says TRAIM = %d", + instance->traim_id); + oncore_log_f(instance, LOG_INFO, "Testing says TRAIM = %d", + instance->traim_ck); + oncore_log_f(instance, LOG_INFO, "Using TRAIM = %d", + instance->traim); if (instance->traim_ck == 1 && instance->traim == 0) { /* if it should be off, and I turned it on during testing, then turn it off again */ if (instance->chan == 6) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Bnx, sizeof(oncore_cmd_Bnx)); + oncore_sendmsg(instance, oncore_cmd_Bnx, sizeof(oncore_cmd_Bnx)); else if (instance->chan == 8) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Enx, sizeof(oncore_cmd_Enx)); + oncore_sendmsg(instance, oncore_cmd_Enx, sizeof(oncore_cmd_Enx)); else /* chan == 12 */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ge0, sizeof(oncore_cmd_Ge0)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_Hn0, sizeof(oncore_cmd_Hn0)); + oncore_sendmsg(instance, oncore_cmd_Ge0, sizeof(oncore_cmd_Ge0)); + oncore_sendmsg(instance, oncore_cmd_Hn0, sizeof(oncore_cmd_Hn0)); } } @@ -3574,28 +3887,28 @@ oncore_shmem_get_3D( instance->shmem_reset = 1; if (instance->chan == 12) { if (instance->shmem_Posn == 2) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Gd2, sizeof(oncore_cmd_Gd2)); /* 2D */ + oncore_sendmsg(instance, oncore_cmd_Gd2, sizeof(oncore_cmd_Gd2)); /* 2D */ else - oncore_sendmsg(instance->ttyfd, oncore_cmd_Gd0, sizeof(oncore_cmd_Gd0)); /* 3D */ + oncore_sendmsg(instance, oncore_cmd_Gd0, sizeof(oncore_cmd_Gd0)); /* 3D */ } else { if (instance->saw_At) { /* out of 0D -> 3D mode */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_At0, sizeof(oncore_cmd_At0)); + oncore_sendmsg(instance, oncore_cmd_At0, sizeof(oncore_cmd_At0)); if (instance->shmem_Posn == 2) /* 3D -> 2D mode */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Av1, sizeof(oncore_cmd_Av1)); + oncore_sendmsg(instance, oncore_cmd_Av1, sizeof(oncore_cmd_Av1)); } else - oncore_sendmsg(instance->ttyfd, oncore_cmd_Av0, sizeof(oncore_cmd_Av0)); + oncore_sendmsg(instance, oncore_cmd_Av0, sizeof(oncore_cmd_Av0)); } } else if (instance->shmem_reset || (instance->mode != MODE_0D)) { instance->shmem_reset = 0; if (instance->chan == 12) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Gd1, sizeof(oncore_cmd_Gd1)); /* 0D */ + oncore_sendmsg(instance, oncore_cmd_Gd1, sizeof(oncore_cmd_Gd1)); /* 0D */ else { if (instance->saw_At) { if (instance->mode == MODE_2D) /* 2D -> 3D or 0D mode */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Av0, sizeof(oncore_cmd_Av0)); - oncore_sendmsg(instance->ttyfd, oncore_cmd_At1, sizeof(oncore_cmd_At1)); /* to 0D mode */ + oncore_sendmsg(instance, oncore_cmd_Av0, sizeof(oncore_cmd_Av0)); + oncore_sendmsg(instance, oncore_cmd_At1, sizeof(oncore_cmd_At1)); /* to 0D mode */ } else - oncore_sendmsg(instance->ttyfd, oncore_cmd_Av1, sizeof(oncore_cmd_Av1)); + oncore_sendmsg(instance, oncore_cmd_Av1, sizeof(oncore_cmd_Av1)); } } } @@ -3614,7 +3927,6 @@ oncore_ss( struct instance *instance ) { - char *cp, Msg[160]; double lat, lon, ht; @@ -3625,15 +3937,14 @@ oncore_ss( if ((instance->chan == 8 && !(instance->BEHa[37] & 0x20)) || (instance->chan == 12 && !(instance->BEHa[130] & 0x10))) { - record_clock_stats(&(instance->peer->srcadr), "Now in 0D mode"); + oncore_log(instance, LOG_INFO, "Now in 0D mode"); if (instance->chan == 12) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Gax, sizeof(oncore_cmd_Gax)); + oncore_sendmsg(instance, oncore_cmd_Gax, sizeof(oncore_cmd_Gax)); else - oncore_sendmsg(instance->ttyfd, oncore_cmd_Asx, sizeof(oncore_cmd_Asx)); + oncore_sendmsg(instance, oncore_cmd_Asx, sizeof(oncore_cmd_Asx)); - cp = "SSstate = ONCORE_SS_DONE"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "SSstate = ONCORE_SS_DONE"); instance->site_survey = ONCORE_SS_DONE; } } else { @@ -3659,22 +3970,22 @@ oncore_ss( instance->ss_long /= POS_HOLD_AVERAGE; instance->ss_ht /= POS_HOLD_AVERAGE; - sprintf(Msg, "Surveyed posn: lat %.3f (mas) long %.3f (mas) ht %.3f (cm)", - instance->ss_lat, instance->ss_long, instance->ss_ht); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_NOTICE, + "Surveyed posn: lat %.3f (mas) long %.3f (mas) ht %.3f (cm)", + instance->ss_lat, instance->ss_long, + instance->ss_ht); lat = instance->ss_lat/3600000.; lon = instance->ss_long/3600000.; ht = instance->ss_ht/100; - sprintf(Msg, "Surveyed posn: lat %.7f (deg) long %.7f (deg) ht %.2f (m)", - lat, lon, ht); - record_clock_stats(&(instance->peer->srcadr), Msg); + oncore_log_f(instance, LOG_NOTICE, + "Surveyed posn: lat %.7f (deg) long %.7f (deg) ht %.2f (m)", + lat, lon, ht); oncore_set_posn(instance); - record_clock_stats(&(instance->peer->srcadr), "Now in 0D mode"); + oncore_log(instance, LOG_INFO, "Now in 0D mode"); - cp = "SSstate = ONCORE_SS_DONE"; - record_clock_stats(&(instance->peer->srcadr), cp); + oncore_log(instance, LOG_NOTICE, "SSstate = ONCORE_SS_DONE"); instance->site_survey = ONCORE_SS_DONE; } } @@ -3687,10 +3998,9 @@ oncore_wait_almanac( ) { if (instance->rsm.bad_almanac) { -#ifdef DEBUG - if (debug) - printf("ONCORE[%d]: waiting for almanac\n", instance->unit); -#endif + instance->counta++; + if (instance->counta%5 == 0) + oncore_log(instance, LOG_INFO, "Waiting for Almanac"); /* * If we get here (first time) then we don't have an almanac in memory. @@ -3707,26 +4017,67 @@ oncore_wait_almanac( (5sec) and wait for things to settle down */ if (instance->chan == 6) - oncore_sendmsg(instance->ttyfd, oncore_cmd_Bn, sizeof(oncore_cmd_Bn)); + oncore_sendmsg(instance, oncore_cmd_Bn, sizeof(oncore_cmd_Bn)); else if (instance->chan == 8) - oncore_sendmsg(instance->ttyfd, oncore_cmd_En, sizeof(oncore_cmd_En)); + oncore_sendmsg(instance, oncore_cmd_En, sizeof(oncore_cmd_En)); else if (instance->chan == 12) { - oncore_sendmsg(instance->ttyfd, oncore_cmd_Gc, sizeof(oncore_cmd_Gc)); /* 1PPS on, continuous */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Ge, sizeof(oncore_cmd_Ge)); /* TRAIM on */ - oncore_sendmsg(instance->ttyfd, oncore_cmd_Hn, sizeof(oncore_cmd_Hn)); /* TRAIM status 1/s */ + oncore_sendmsg(instance, oncore_cmd_Gc, sizeof(oncore_cmd_Gc)); /* 1PPS on, continuous */ + oncore_sendmsg(instance, oncore_cmd_Ge, sizeof(oncore_cmd_Ge)); /* TRAIM on */ + oncore_sendmsg(instance, oncore_cmd_Hn, sizeof(oncore_cmd_Hn)); /* TRAIM status 1/s */ } instance->traim_delay = 1; - record_clock_stats(&(instance->peer->srcadr), "Have now loaded an ALMANAC"); + oncore_log(instance, LOG_NOTICE, "Have now loaded an ALMANAC"); instance->o_state = ONCORE_RUN; - record_clock_stats(&(instance->peer->srcadr), "state = ONCORE_RUN"); + oncore_log(instance, LOG_NOTICE, "state = ONCORE_RUN"); } return(0); } +static void +oncore_log ( + struct instance *instance, + int log_level, + const char *msg + ) +{ + msyslog(log_level, "ONCORE[%d]: %s", instance->unit, msg); + mprintf_clock_stats(&instance->peer->srcadr, "ONCORE[%d]: %s", + instance->unit, msg); +} + + +static int +oncore_log_f( + struct instance * instance, + int log_level, + const char * fmt, + ... + ) +{ + va_list ap; + int rc; + char msg[512]; + + va_start(ap, fmt); + rc = mvsnprintf(msg, sizeof(msg), fmt, ap); + va_end(ap); + oncore_log(instance, log_level, msg); + +#ifdef ONCORE_VERBOSE_ONCORE_LOG + instance->max_len = max(strlen(msg), instance->max_len); + instance->max_count++; + if (instance->max_count % 100 == 0) + oncore_log_f(instance, LOG_INFO, + "Max Message Length so far is %d", + instance->max_len); +#endif + return rc; +} + #else int refclock_oncore_bs; -#endif /* REFCLOCK */ +#endif /* REFCLOCK && CLOCK_ONCORE */ |
