Make sure 24A and 24B aivdm sentences are correctly aggregated.

Patch adds unit tests for all the collision cases. 

All regression tests pass.

Signed-off-by: Eric S. Raymond <esr@thyrsus.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/gpsd.h-tail b/gpsd.h-tail
index fdb44a19..e3b4ee25 100644
--- a/gpsd.h-tail
+++ b/gpsd.h-tail
@@ -196,8 +196,9 @@ struct aivdm_context_t {
     /* hold context for decoding AIDVM packet sequences */
     int decoded_frags;		/* for tracking AIDVM parts in a multipart sequence */
     unsigned char bits[2048];
-    size_t bitlen;
-    char shipname[AIS_SHIPNAME_MAXLEN+1]; /* type 24 specific */
+    size_t bitlen; /* how many valid bits */
+    unsigned int mmsi24; /* type 24 specific */
+    char shipname24[AIS_SHIPNAME_MAXLEN+1]; /* type 24 specific */
 };
 
 struct gps_device_t;