diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2011-06-14 18:52:34 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-06-14 18:52:34 -0400 |
| commit | e5cf5cd806ee0277ec4174acc9dfdf7cb0c85f64 (patch) | |
| tree | 45a78c70c07dcc003de6e9a4f998bba9620d54f8 /gpsdecode.c | |
| parent | 6d3452b088042bcb6deb9521efa53dd0f9a029cd (diff) | |
| download | gpsd-e5cf5cd806ee0277ec4174acc9dfdf7cb0c85f64.tar.gz | |
First xut at JSON passthrough code.
Not turned in by default yet; it interferes with RTCM2 decoding.
Diffstat (limited to 'gpsdecode.c')
| -rw-r--r-- | gpsdecode.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gpsdecode.c b/gpsdecode.c index 50d3d52b..73ff6136 100644 --- a/gpsdecode.c +++ b/gpsdecode.c @@ -410,14 +410,18 @@ static void decode(FILE *fpin, FILE*fpout) break; if (verbose >= 1 && TEXTUAL_PACKET_TYPE(session.packet.type)) (void)fputs((char *)session.packet.outbuffer, fpout); - if ((changed & (REPORT_IS|SUBFRAME_SET|AIS_SET|RTCM2_SET|RTCM3_SET)) == 0) + if ((changed & (REPORT_IS|SUBFRAME_SET|AIS_SET|RTCM2_SET|RTCM3_SET|PASSTHROUGH_IS)) == 0) continue; if (!filter(changed, &session)) continue; else if (json) { - json_data_report(changed, - &session.gpsdata, &policy, - buf, sizeof(buf)); + if ((changed & PASSTHROUGH_IS) != 0) { + (void)fputs((char *)session.packet.outbuffer, fpout); + (void)fputs("\n", fpout); + } else + json_data_report(changed, + &session.gpsdata, &policy, + buf, sizeof(buf)); (void)fputs(buf, fpout); #ifdef AIVDM_ENABLE } else if (session.packet.type == AIVDM_PACKET) { |