chronfd doesn't belong in the thread context, move it back out to session.

3 files changed, 9 insertions, 9 deletions

diff --git a/gpsd.h-tail b/gpsd.h-tail
index 83fd6c18..465a8236 100644
--- a/gpsd.h-tail
+++ b/gpsd.h-tail
@@ -468,6 +468,7 @@ struct gps_device_t {
 #endif /* NTPSHM_ENABLE */
 # ifdef PPS_ENABLE
     volatile /*@null@*/ struct shmTime *shm_pps;
+    int chronyfd;			/* for talking to chrony */
 # endif /* PPS_ENABLE */
 #endif /* NTP_ENABLE */
 #ifdef PPS_ENABLE
diff --git a/ppsthread.h b/ppsthread.h
index 4178813b..c048afaf 100644
--- a/ppsthread.h
+++ b/ppsthread.h
@@ -44,7 +44,6 @@ struct pps_thread_t {
 #endif /* defined(HAVE_SYS_TIMEPPS_H) */
     int devicefd;			/* device file descriptor */
     char *devicename;
-    int chronyfd;			/* for talking to chrony */
     /*@null@*/ char *(*report_hook)(volatile struct pps_thread_t *,
 				    struct timedelta_t *);
     /*@null@*/ void (*wrap_hook)(volatile struct pps_thread_t *);
diff --git a/timehint.c b/timehint.c
index 5f17e333..34bf9c56 100644
--- a/timehint.c
+++ b/timehint.c
@@ -279,7 +279,7 @@ static void init_hook(struct gps_device_t *session)
     /* open the chrony socket */
     char chrony_path[GPS_PATH_MAX];
 
-    session->pps_thread.chronyfd = -1;
+    session->chronyfd = -1;
     if ( 0 == getuid() ) {
 	/* this case will fire on command-line devices;
 	 * they're opened before priv-dropping.  Matters because
@@ -296,11 +296,11 @@ static void init_hook(struct gps_device_t *session)
 	gpsd_log(&session->context->errout, LOG_PROG,
 		 "PPS chrony socket %s doesn't exist\n", chrony_path);
     } else {
-	session->pps_thread.chronyfd = netlib_localsocket(chrony_path, SOCK_DGRAM);
-	if (session->pps_thread.chronyfd < 0)
+	session->chronyfd = netlib_localsocket(chrony_path, SOCK_DGRAM);
+	if (session->chronyfd < 0)
 	    gpsd_log(&session->context->errout, LOG_PROG,
 		     "PPS connect chrony socket failed: %s, error: %d, errno: %d/%s\n",
-		     chrony_path, session->pps_thread.chronyfd, errno, strerror(errno));
+		     chrony_path, session->chronyfd, errno, strerror(errno));
 	else
 	    gpsd_log(&session->context->errout, LOG_RAW,
 			"PPS using chrony socket: %s\n", chrony_path);
@@ -343,14 +343,14 @@ static void chrony_send(struct gps_device_t *session, struct timedelta_t *td)
 	     "PPS chrony_send %s @ %s Offset: %0.9f\n",
 	     real_str, clock_str, sample.offset);
     /*@+type@*/
-    (void)send(session->pps_thread.chronyfd, &sample, sizeof (sample), 0);
+    (void)send(session->chronyfd, &sample, sizeof (sample), 0);
 }
 
 static void wrap_hook(volatile struct pps_thread_t *pps_thread)
 {
     struct gps_device_t *session = (struct gps_device_t *)pps_thread->context;
-    if (session->pps_thread.chronyfd != -1)
-	(void)close(session->pps_thread.chronyfd);
+    if (session->chronyfd != -1)
+	(void)close(session->chronyfd);
 }
 
 static /*@observer@*/ char *report_hook(volatile struct pps_thread_t *pps_thread,
@@ -376,7 +376,7 @@ static /*@observer@*/ char *report_hook(volatile struct pps_thread_t *pps_thread
 	return "no fix";
 
     log1 = "accepted";
-    if ( 0 <= session->pps_thread.chronyfd ) {
+    if ( 0 <= session->chronyfd ) {
 	log1 = "accepted chrony sock";
 	chrony_send(session, td);
     }