Handle alternative GT06 message format

sunhoww · Aug 2, 2018 · a4ad137 · a4ad137
1 parent e8357f9
commit a4ad137
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -251,8 +251,8 @@ private boolean decodeLbs(Position position, ByteBuf buf, boolean hasLength) {
         position.setNetwork(new Network(CellTower.from(
                 BitUtil.to(mcc, 15), mnc, buf.readUnsignedShort(), buf.readUnsignedMedium())));
 
-        if (length > 0) {
-            buf.skipBytes(length - (hasLength ? 9 : 8));
+        if (length > 9) {
+            buf.skipBytes(length - 9);
         }
 
         return true;

diff --git a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -16,6 +16,9 @@ public void testDecode() throws Exception {
         verifyNull(decoder, binary(
                 "78780D01086471700328358100093F040D0A"));
 
+        verifyNotNull(decoder, binary(
+                "78781219028f0a29e10036f12003040102000875dc0d0a"));
+
         verifyAttributes(decoder, binary(
                 "79790008940000ed0289d6860d0a"));