[Bug 2636] Clutter in syslog if gpsd not running

- log GPSD revision and release numbers with protocol version

bk: 53f7a4939tfVtwPplArlstrVJteuIQ

diff --git a/ChangeLog b/ChangeLog
index ea3f87b8853d793692f41d69b8315f236a65da1e..852cb021d4ccc2216450b451ea8c110a44ab60b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 * [Bug 2636] Clutter in syslog if gpsd not running
    - found (hopefully) last cause for clutter in protocol version
+   - log GPSD revision and release numbers with protocol version
 (4.2.7p464) 2014/08/22 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2636] Fix coverity warning from previous patch.
 (4.2.7p463) 2014/08/21 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/refclock_gpsdjson.c b/ntpd/refclock_gpsdjson.c
index 2ff321acaec103461b3933fb2ecf7d3cd3d275a7..615098271e3bb95466feb9afa09f7bb27c4c8e9c 100644 (file)
--- a/ntpd/refclock_gpsdjson.c
+++ b/ntpd/refclock_gpsdjson.c
@@ -782,8 +782,14 @@ process_version(
 
        int    len;
        char * buf;
+       const char *revision;
+       const char *release;
 
        /* get protocol version number */
+       revision = json_object_lookup_string_default(
+           jctx, 0, "rev", "(unknown)");
+       release  = json_object_lookup_string_default(
+           jctx, 0, "release", "(unknown)");
        errno = 0;
        up->proto_major = (uint16_t)json_object_lookup_int(
                jctx, 0, "proto_major");
@@ -793,8 +799,9 @@ process_version(
                up->fl_vers = -1;
                if (syslogok(pp, up))
                        msyslog(LOG_INFO,
-                               "%s: GPSD protocol version %u.%u",
+                               "%s: GPSD revision=%s release=%s protocol=%u.%u",
                                refnumtoa(&peer->srcadr),
+                               revision, release,
                                up->proto_major, up->proto_minor);
        }