diff options
Diffstat (limited to 'gpsd.h-tail')
| -rw-r--r-- | gpsd.h-tail | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/gpsd.h-tail b/gpsd.h-tail index 3dcb412a..14dedf9c 100644 --- a/gpsd.h-tail +++ b/gpsd.h-tail @@ -183,15 +183,6 @@ struct gps_context_t { /* DGPSIP status */ bool sentdgps; /* have we sent a DGPS report? */ enum { netgnss_none, netgnss_dgpsip, netgnss_ntrip} netgnss_service; /* type of GNSS service */ - enum { - ntrip_conn_init, - ntrip_conn_sent_probe, - ntrip_conn_sent_get, - ntrip_conn_established, - ntrip_conn_err - } ntrip_conn_state; /* ntrip connection state for multi stage connect */ - bool ntrip_works; /* this marks a working connection, so we try to reconnect once */ - bool ntrip_sourcetable_parse; /* have we read the sourcetable header? */ int fixcnt; /* count of good fixes seen */ socket_t dsock; /* socket to DGPSIP server/Ntrip caster */ size_t rtcmbytes; /* byte count of last RTCM104 report */ @@ -518,6 +509,22 @@ struct gps_device_t { unsigned int bufindex; } isgps; #endif /* BINARY_ENABLE */ + + /* + * State of an NTRIP connection. Havoc will ensue if ntrip_conn_init + * is not 0, as this is initialized by memset(... '\0', ...). + */ + struct { + enum { + ntrip_conn_init, + ntrip_conn_sent_probe, + ntrip_conn_sent_get, + ntrip_conn_established, + ntrip_conn_err + } conn_state; /* connection state for multi stage connect */ + bool works; /* marks a working connection, so we try to reconnect once */ + bool sourcetable_parse; /* have we read the sourcetable header? */ + } ntrip; } driver; /* * Auxiliary structures for parsing data that can be interleaved with |