aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2021-07-02 13:33:37 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2021-07-02 13:33:37 -0700
commitfc56f571dbef88316ef3dbf98d8351e6e34cba62 (patch)
tree82718ad6ac77f21221f7084f044f3379840ac5b9
parent9a070e77b5c459781a9cdf1e143b2034a19e86b7 (diff)
downloadtraccar-server-fc56f571dbef88316ef3dbf98d8351e6e34cba62.tar.gz
traccar-server-fc56f571dbef88316ef3dbf98d8351e6e34cba62.tar.bz2
traccar-server-fc56f571dbef88316ef3dbf98d8351e6e34cba62.zip
Initial STB IND protocol support
-rw-r--r--setup/default.xml1
-rw-r--r--src/main/java/org/traccar/protocol/StbFrameDecoder.java55
-rw-r--r--src/main/java/org/traccar/protocol/StbProtocol.java38
-rw-r--r--src/main/java/org/traccar/protocol/StbProtocolDecoder.java66
-rw-r--r--src/test/java/org/traccar/protocol/StbFrameDecoderTest.java19
-rw-r--r--src/test/java/org/traccar/protocol/StbProtocolDecoderTest.java18
6 files changed, 197 insertions, 0 deletions
diff --git a/setup/default.xml b/setup/default.xml
index 0564182c7..c80961df9 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -293,5 +293,6 @@
<entry key='r12w.port'>5226</entry>
<entry key='flexiblereport.port'>5227</entry>
<entry key='thinkpower.port'>5228</entry>
+ <entry key='stb.port'>5229</entry>
</properties>
diff --git a/src/main/java/org/traccar/protocol/StbFrameDecoder.java b/src/main/java/org/traccar/protocol/StbFrameDecoder.java
new file mode 100644
index 000000000..6a4157f17
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/StbFrameDecoder.java
@@ -0,0 +1,55 @@
+/*
+ * 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 StbFrameDecoder extends BaseFrameDecoder {
+
+ @Override
+ protected Object decode(
+ ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception {
+
+ int startIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) '{');
+ if (startIndex >= 0) {
+
+ buf.readerIndex(startIndex);
+
+ int currentIndex = startIndex + 1;
+ int nesting = 1;
+ while (currentIndex < buf.writerIndex() && nesting > 0) {
+ byte currentByte = buf.getByte(currentIndex);
+ if (currentByte == '{') {
+ nesting += 1;
+ } else if (currentByte == '}') {
+ nesting -= 1;
+ }
+ currentIndex += 1;
+ }
+
+ if (nesting == 0) {
+ return buf.readRetainedSlice(currentIndex - startIndex);
+ }
+
+ }
+
+ return null;
+ }
+
+}
diff --git a/src/main/java/org/traccar/protocol/StbProtocol.java b/src/main/java/org/traccar/protocol/StbProtocol.java
new file mode 100644
index 000000000..ca95787d0
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/StbProtocol.java
@@ -0,0 +1,38 @@
+/*
+ * 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.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import org.traccar.BaseProtocol;
+import org.traccar.PipelineBuilder;
+import org.traccar.TrackerServer;
+
+public class StbProtocol extends BaseProtocol {
+
+ public StbProtocol() {
+ addServer(new TrackerServer(false, getName()) {
+ @Override
+ protected void addProtocolHandlers(PipelineBuilder pipeline) {
+ pipeline.addLast(new StbFrameDecoder());
+ pipeline.addLast(new StringEncoder());
+ pipeline.addLast(new StringDecoder());
+ pipeline.addLast(new StbProtocolDecoder(StbProtocol.this));
+ }
+ });
+ }
+
+}
diff --git a/src/main/java/org/traccar/protocol/StbProtocolDecoder.java b/src/main/java/org/traccar/protocol/StbProtocolDecoder.java
new file mode 100644
index 000000000..7e25674b9
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/StbProtocolDecoder.java
@@ -0,0 +1,66 @@
+/*
+ * 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 com.fasterxml.jackson.annotation.JsonProperty;
+import io.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.Context;
+import org.traccar.NetworkMessage;
+import org.traccar.Protocol;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import java.io.StringReader;
+import java.net.SocketAddress;
+
+public class StbProtocolDecoder extends BaseProtocolDecoder {
+
+ public StbProtocolDecoder(Protocol protocol) {
+ super(protocol);
+ }
+
+ public static class Response {
+ @JsonProperty("msgType")
+ private int type;
+ @JsonProperty("devId")
+ private String deviceId;
+ @JsonProperty("result")
+ private int result;
+ @JsonProperty("txnNo")
+ private String transaction;
+ }
+
+ @Override
+ protected Object decode(
+ Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+ JsonObject root = Json.createReader(new StringReader((String) msg)).readObject();
+
+ Response response = new Response();
+ response.type = root.getInt("msgType");
+ response.deviceId = root.getString("devId");
+ response.result = 1;
+ response.transaction = root.getString("txnNo");
+ if (channel != null) {
+ channel.writeAndFlush(new NetworkMessage(
+ Context.getObjectMapper().writeValueAsString(response), remoteAddress));
+ }
+
+ return null;
+ }
+
+}
diff --git a/src/test/java/org/traccar/protocol/StbFrameDecoderTest.java b/src/test/java/org/traccar/protocol/StbFrameDecoderTest.java
new file mode 100644
index 000000000..45d998fb1
--- /dev/null
+++ b/src/test/java/org/traccar/protocol/StbFrameDecoderTest.java
@@ -0,0 +1,19 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class StbFrameDecoderTest extends ProtocolTest {
+
+ @Test
+ public void testDecode() throws Exception {
+
+ var decoder = new StbFrameDecoder();
+
+ verifyFrame(
+ binary("7b226465764964223a2243485a4430384b504430323130343235303436222c2264657654797065223a322c226861726456657273696f6e223a224844545456413139222c226d736754797065223a3131302c2270726f746f636f6c56657273696f6e223a225631222c22736f667456657273696f6e223a22332e312e38222c22737769746368436162537461747573223a2231222c2274786e4e6f223a2231363235323132373431353337227d"),
+ decoder.decode(null, null, binary("7b226465764964223a2243485a4430384b504430323130343235303436222c2264657654797065223a322c226861726456657273696f6e223a224844545456413139222c226d736754797065223a3131302c2270726f746f636f6c56657273696f6e223a225631222c22736f667456657273696f6e223a22332e312e38222c22737769746368436162537461747573223a2231222c2274786e4e6f223a2231363235323132373431353337227d")));
+
+ }
+
+}
diff --git a/src/test/java/org/traccar/protocol/StbProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/StbProtocolDecoderTest.java
new file mode 100644
index 000000000..ec7ef7299
--- /dev/null
+++ b/src/test/java/org/traccar/protocol/StbProtocolDecoderTest.java
@@ -0,0 +1,18 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class StbProtocolDecoderTest extends ProtocolTest {
+
+ @Test
+ public void testDecode() throws Exception {
+
+ var decoder = new StbProtocolDecoder(null);
+
+ verifyPosition(decoder, text(
+ "{\"devId\":\"CHZD08KPD0210425046\",\"devType\":2,\"hardVersion\":\"HDTTVA19\",\"msgType\":110,\"protocolVersion\":\"V1\",\"softVersion\":\"3.1.8\",\"switchCabStatus\":\"1\",\"txnNo\":\"1625212741537\"}"));
+
+ }
+
+}