Satellite protocol support

5 files changed, 83 insertions, 5 deletions

diff --git a/src/main/java/org/traccar/protocol/AdmFrameDecoder.java b/src/main/java/org/traccar/protocol/AdmFrameDecoder.java
new file mode 100644
index 000000000..7ee9b6874
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/AdmFrameDecoder.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2021 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import org.traccar.BaseFrameDecoder;
+
+public class AdmFrameDecoder extends BaseFrameDecoder {
+
+    @Override
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception {
+
+        if (buf.readableBytes() < 15 + 3) {
+            return null;
+        }
+
+        int length;
+        if (Character.isDigit(buf.getUnsignedByte(buf.readerIndex()))) {
+            length = 15 + buf.getUnsignedByte(buf.readerIndex() + 15 + 2);
+        } else {
+            length = buf.getUnsignedByte(buf.readerIndex() + 2);
+        }
+
+        if (buf.readableBytes() >= length) {
+            return buf.readRetainedSlice(length);
+        }
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/org/traccar/protocol/AdmProtocol.java b/src/main/java/org/traccar/protocol/AdmProtocol.java
index 93b1e355a..d1d81118c 100644
--- a/src/main/java/org/traccar/protocol/AdmProtocol.java
+++ b/src/main/java/org/traccar/protocol/AdmProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2021 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,12 @@
  */
 package org.traccar.protocol;
 
-import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
 import io.netty.handler.codec.string.StringEncoder;
 import org.traccar.BaseProtocol;
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 import org.traccar.model.Command;
 
-import java.nio.ByteOrder;
-
 public class AdmProtocol extends BaseProtocol {
 
     public AdmProtocol() {
@@ -33,7 +30,7 @@ public class AdmProtocol extends BaseProtocol {
         addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
-                pipeline.addLast(new LengthFieldBasedFrameDecoder(ByteOrder.LITTLE_ENDIAN, 1024, 2, 1, -3, 0, true));
+                pipeline.addLast(new AdmFrameDecoder());
                 pipeline.addLast(new StringEncoder());
                 pipeline.addLast(new AdmProtocolEncoder(AdmProtocol.this));
                 pipeline.addLast(new AdmProtocolDecoder(AdmProtocol.this));
diff --git a/src/main/java/org/traccar/protocol/AdmProtocolDecoder.java b/src/main/java/org/traccar/protocol/AdmProtocolDecoder.java
index 52d1439ed..31064286e 100644
--- a/src/main/java/org/traccar/protocol/AdmProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/AdmProtocolDecoder.java
@@ -178,6 +178,10 @@ public class AdmProtocolDecoder extends BaseProtocolDecoder {
     protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
         ByteBuf buf = (ByteBuf) msg;
 
+        if (Character.isDigit(buf.getUnsignedByte(buf.readerIndex()))) {
+            getDeviceSession(channel, remoteAddress, buf.readSlice(15).toString(StandardCharsets.UTF_8));
+        }
+
         buf.readUnsignedShortLE(); // device id
 
         int size = buf.readUnsignedByte();
diff --git a/src/test/java/org/traccar/protocol/AdmFrameDecoderTest.java b/src/test/java/org/traccar/protocol/AdmFrameDecoderTest.java
new file mode 100644
index 000000000..e7297cdbd
--- /dev/null
+++ b/src/test/java/org/traccar/protocol/AdmFrameDecoderTest.java
@@ -0,0 +1,27 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class AdmFrameDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        AdmFrameDecoder decoder = new AdmFrameDecoder();
+
+        verifyFrame(
+                binary("38363931353330343235323337383400003728e000001402441d5f42c3711642930d000000c7000a461954f25fd82ed508000000000000000044000000010000000000140000"),
+                decoder.decode(null, null, binary("38363931353330343235323337383400003728e000001402441d5f42c3711642930d000000c7000a461954f25fd82ed508000000000000000044000000010000000000140000")));
+
+        verifyFrame(
+                binary("000042033836393135333034323532333738340000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000078"),
+                decoder.decode(null, null, binary("000042033836393135333034323532333738340000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000078")));
+
+        verifyFrame(
+                binary("010022003300072020000000000000000044062A330000000000107F10565D4A8310"),
+                decoder.decode(null, null, binary("010022003300072020000000000000000044062A330000000000107F10565D4A8310")));
+
+    }
+
+}
diff --git a/src/test/java/org/traccar/protocol/AdmProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AdmProtocolDecoderTest.java
index 51e1e2bab..bf8a81dc1 100644
--- a/src/test/java/org/traccar/protocol/AdmProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/AdmProtocolDecoderTest.java
@@ -10,6 +10,9 @@ public class AdmProtocolDecoderTest extends ProtocolTest {
 
         AdmProtocolDecoder decoder = new AdmProtocolDecoder(null);
 
+        verifyPosition(decoder, binary(
+                "38363931353330343235323337383400003728e000001402441d5f42c3711642930d000000c7000a461954f25fd82ed508000000000000000044000000010000000000140000"));
+
         verifyNull(decoder, binary(
                 "000042033836393135333034323532333738340000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000078"));