From: Juergen Perlinger <perlinger@ntp.org>
Date: Wed, 13 Apr 2022 19:57:26 +0000 (+0200)
Subject: [Bug 3758] Provide a 'device' config statement for refclocks
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddba04fe19f0adf8ab57cb6528c3c826d9ec9e66;p=thirdparty%2Fntp.git

[Bug 3758] Provide a 'device' config statement for refclocks
 hook up refclock_gpsdjson to device redirection

bk: 62572b26Rsaiu3-6BU33ydrWecEe4Q
---

diff --git a/ntpd/ntp_clockdev.c b/ntpd/ntp_clockdev.c
index fbd59f0f6..312cebd5a 100644
--- a/ntpd/ntp_clockdev.c
+++ b/ntpd/ntp_clockdev.c
@@ -78,7 +78,7 @@ getClockIdent(
 	return (clkType << 8) + clkUnit;
 }
 
-/* Purge the complete redirection lis.t */
+/* Purge the complete redirection list. */
 void
 clockdev_clear(void)
 {
diff --git a/ntpd/refclock_gpsdjson.c b/ntpd/refclock_gpsdjson.c
index 0cb2fc408..038b0e433 100644
--- a/ntpd/refclock_gpsdjson.c
+++ b/ntpd/refclock_gpsdjson.c
@@ -150,6 +150,7 @@ typedef unsigned long int json_uint;
 #include "ntp_refclock.h"
 #include "ntp_stdlib.h"
 #include "ntp_calendar.h"
+#include "ntp_clockdev.h"
 #include "timespecops.h"
 
 /* get operation modes from mode word.
@@ -193,7 +194,7 @@ typedef unsigned long int json_uint;
 #define	REFID		"GPSD"	/* reference id */
 #define	DESCRIPTION	"GPSD JSON client clock" /* who we are */
 
-#define MAX_PDU_LEN	1600
+#define MAX_PDU_LEN	8192	/* multi-GNSS reports can be HUGE */
 #define TICKOVER_LOW	10
 #define TICKOVER_HIGH	120
 #define LOGTHROTTLE	3600
@@ -369,7 +370,7 @@ static void gpsd_parse(peerT * const peer,
 static BOOL convert_ascii_time(l_fp * fp, const char * gps_time);
 static void save_ltc(clockprocT * const pp, const char * const tc);
 static int  syslogok(clockprocT * const pp, gpsd_unitT * const up);
-static void log_data(peerT *peer, const char *what,
+static void log_data(peerT *peer, int level, const char *what,
 		     const char *buf, size_t len);
 static int16_t clamped_precision(int rawprec);
 
@@ -502,6 +503,7 @@ gpsd_start(
 	clockprocT  * const pp = peer->procptr;
 	gpsd_unitT  * up;
 	gpsd_unitT ** uscan    = &s_clock_units;
+	const char  *tmpName;
 
 	struct stat sb;
 
@@ -531,8 +533,10 @@ gpsd_start(
 		 * practicable, we will have to read the symlink, if
 		 * any, so we can get the true device file.)
 		 */
-		if (-1 == myasprintf(&up->device, "%s%u",
-				     s_dev_stem, up->unit)) {
+		tmpName = clockdev_lookup(&peer->srcadr, 0);
+		if (NULL != tmpName) {
+			up->device = estrdup(tmpName);
+		} else if (-1 == myasprintf(&up->device, "%s%u", s_dev_stem, up->unit)) {
 			msyslog(LOG_ERR, "%s: clock device name too long",
 				up->logname);
 			goto dev_fail;
@@ -657,7 +661,7 @@ gpsd_receive(
 	char       *pdst, *edst, ch;
 
 	/* log the data stream, if this is enabled */
-	log_data(peer, "recv", (const char*)rbufp->recv_buffer,
+	log_data(peer, 3, "recv", (const char*)rbufp->recv_buffer,
 		 (size_t)rbufp->recv_length);
 
 
@@ -672,7 +676,7 @@ gpsd_receive(
 	esrc = psrc + rbufp->recv_length;
 
 	pdst = up->buffer + up->buflen;
-	edst = pdst + sizeof(up->buffer) - 1; /* for trailing NUL */
+	edst = up->buffer + sizeof(up->buffer) - 1; /* for trailing NUL */
 
 	while (psrc != esrc) {
 		ch = *psrc++;
@@ -835,7 +839,7 @@ timer_primary(
 			size_t rlen = strlen(s_req_version);
 			DPRINTF(2, ("%s: timer livecheck: '%s'\n",
 				    up->logname, s_req_version));
-			log_data(peer, "send", s_req_version, rlen);
+			log_data(peer, 2, "send", s_req_version, rlen);
 			rc = write(pp->io.fd, s_req_version, rlen);
 			(void)rc;
 		} else if (-1 != up->fdt) {
@@ -1515,7 +1519,7 @@ process_version(
 		 up->device, (up->pf_toff ? ",\"pps\":true" : ""));
 	buf = up->buffer;
 	len = strlen(buf);
-	log_data(peer, "send", buf, len);
+	log_data(peer, 2, "send", buf, len);
 	if (len != write(pp->io.fd, buf, len) && (syslogok(pp, up))) {
 		/* Note: if the server fails to read our request, the
 		 * resulting data timeout will take care of the
@@ -2172,6 +2176,7 @@ add_string(
 static void
 log_data(
 	peerT      *peer,
+	int         level,
 	const char *what,
 	const char *buf ,
 	size_t      len )
@@ -2182,7 +2187,7 @@ log_data(
 	clockprocT * const pp = peer->procptr;
 	gpsd_unitT * const up = (gpsd_unitT *)pp->unitptr;
 
-	if (debug > 1) {
+	if (debug >= level) {
 		const char *sptr = buf;
 		const char *stop = buf + len;
 		char       *dptr = s_lbuf;