summaryrefslogtreecommitdiff
path: root/net_ntrip.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2011-02-24 10:22:21 -0500
committerEric S. Raymond <esr@thyrsus.com>2011-02-24 10:22:21 -0500
commitafe3e0bd526f25089307ddd1482fffd6abf4a51a (patch)
tree8e76161b40656c2596f66c11d3ba7d8a3eb6b473 /net_ntrip.c
parente9f0b59325f6ea938ff8ff892cf181c6d209db9a (diff)
downloadgpsd-afe3e0bd526f25089307ddd1482fffd6abf4a51a.tar.gz
Eliminate the dsock member in the context structure.
Another step towards integrating NTRIP support in a way that's actually correct for the daemon architecture. This involved conditioning out code for DGPSIP server lookups, a feature which was never documented and has probably been broken forever. It's actually not even clear there are still any DGPSIP servers still running; the dgpsip package was removed from Debiann at maintainer request in 2008 (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=392666). I may yet just rip out that code entirely.
Diffstat (limited to 'net_ntrip.c')
-rw-r--r--net_ntrip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net_ntrip.c b/net_ntrip.c
index 27451406..b12e8e32 100644
--- a/net_ntrip.c
+++ b/net_ntrip.c
@@ -582,10 +582,10 @@ void ntrip_report(struct gps_device_t *session)
count ++;
if (ntrip_stream.nmea != 0
&& session->context->fixcnt > 10 && (count % 5)==0) {
- if (session->context->dsock > -1) {
+ if (session->gpsdata.gps_fd > -1) {
char buf[BUFSIZ];
gpsd_position_fix_dump(session, buf, sizeof(buf));
- if (write(session->context->dsock, buf, strlen(buf)) ==
+ if (write(session->gpsdata.gps_fd, buf, strlen(buf)) ==
(ssize_t) strlen(buf)) {
gpsd_report(LOG_IO, "=> dgps %s\n", buf);
} else {