Move NTP link activation from device stash time to device open time.

Fixes a subtle bug resulting from the device source type not being
known at link activation time. We had to choose between trying to
filter on source type and having PPS blocked, or not filtering
abd having the tests hang.

All regression tests pass. PPS is live.

1 files changed, 16 insertions, 16 deletions

diff --git a/gpsd.c b/gpsd.c
index f31d07eb..8f80f915 100644
--- a/gpsd.c
+++ b/gpsd.c
@@ -694,6 +694,22 @@ static bool open_device( /*@null@*/struct gps_device_t *device)
     if (NULL == device || gpsd_activate(device, O_OPTIMIZE) < 0) {
 	return false;
     }
+#ifdef NTPSHM_ENABLE
+    /*
+     * Now is the right time to grab the shared memory segment(s)
+     * to communicate the navigation message derived and (possibly)
+     * 1PPS derived time data to ntpd/chrony.
+     */
+    /* do not start more than one PPS-watcher thread */
+    if (!(device->shmindex >= 0))
+	ntpd_link_activate(device);
+
+    gpsd_report(context.debug, LOG_INF, 
+		"NTPD ntpd_link_activate: %d\n",
+		(int)device->shmindex >= 0);
+
+
+#endif /* NTPSHM_ENABLE */
     gpsd_report(context.debug, LOG_INF, 
 		"device %s activated\n", device->gpsdata.dev.path);
     FD_SET(device->gpsdata.gps_fd, &all_fds);
@@ -717,22 +733,6 @@ bool gpsd_add_device(const char *device_name, bool flag_nowait)
     for (devp = devices; devp < devices + MAXDEVICES; devp++)
 	if (!allocated_device(devp)) {
 	    gpsd_init(devp, &context, device_name);
-#ifdef NTPSHM_ENABLE
-	    /*
-	     * Now is the right time to grab the shared memory segment(s)
-	     * to communicate the navigation message derived and (possibly)
-	     * 1pps derived time data to ntpd.
-	     */
-
-	    /* do not start more than one ntp thread */
-	    if (!(devp->shmindex >= 0))
-	        ntpd_link_activate(devp);
-
-	    gpsd_report(context.debug, LOG_INF, 
-			"NTPD ntpd_link_activate: %d\n",
-			(int)devp->shmindex >= 0);
-
-#endif /* NTPSHM_ENABLE */
 	    gpsd_report(context.debug, LOG_INF,
 			"stashing device %s at slot %d\n",
 			device_name, (int)(devp - devices));