aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--setup/default.xml1
-rw-r--r--src/main/java/org/traccar/protocol/NiotProtocol.java35
-rw-r--r--src/main/java/org/traccar/protocol/NiotProtocolDecoder.java102
-rw-r--r--src/test/java/org/traccar/protocol/NiotProtocolDecoderTest.java21
4 files changed, 159 insertions, 0 deletions
diff --git a/setup/default.xml b/setup/default.xml
index 79cc1068e..74ae09a10 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -287,5 +287,6 @@
<entry key='pst.port'>5207</entry>
<entry key='dingtek.port'>5208</entry>
<entry key='wli.port'>5209</entry>
+ <entry key='niot.port'>5210</entry>
</properties>
diff --git a/src/main/java/org/traccar/protocol/NiotProtocol.java b/src/main/java/org/traccar/protocol/NiotProtocol.java
new file mode 100644
index 000000000..b57b18a3a
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/NiotProtocol.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 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.LengthFieldBasedFrameDecoder;
+import org.traccar.BaseProtocol;
+import org.traccar.PipelineBuilder;
+import org.traccar.TrackerServer;
+
+public class NiotProtocol extends BaseProtocol {
+
+ public NiotProtocol() {
+ addServer(new TrackerServer(false, getName()) {
+ @Override
+ protected void addProtocolHandlers(PipelineBuilder pipeline) {
+ pipeline.addLast(new LengthFieldBasedFrameDecoder(1024, 3, 2));
+ pipeline.addLast(new NiotProtocolDecoder(NiotProtocol.this));
+ }
+ });
+ }
+
+}
diff --git a/src/main/java/org/traccar/protocol/NiotProtocolDecoder.java b/src/main/java/org/traccar/protocol/NiotProtocolDecoder.java
new file mode 100644
index 000000000..81b6efc91
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/NiotProtocolDecoder.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2020 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.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.DeviceSession;
+import org.traccar.NetworkMessage;
+import org.traccar.Protocol;
+import org.traccar.helper.BcdUtil;
+import org.traccar.helper.Checksum;
+import org.traccar.helper.DateBuilder;
+import org.traccar.helper.UnitsConverter;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+
+public class NiotProtocolDecoder extends BaseProtocolDecoder {
+
+ public NiotProtocolDecoder(Protocol protocol) {
+ super(protocol);
+ }
+
+ public static final int MSG_RESPONSE = 0x21;
+ public static final int MSG_POSITION_DATA = 0x80;
+
+ private void sendResponse(Channel channel, SocketAddress remoteAddress, int type, int checksum) {
+ if (channel != null) {
+ ByteBuf response = Unpooled.buffer();
+ response.writeShort(0x5858); // header
+ response.writeByte(MSG_RESPONSE);
+ response.writeShort(5); // length
+ response.writeByte(checksum);
+ response.writeByte(type);
+ response.writeByte(0); // subtype
+ response.writeByte(Checksum.xor(response.nioBuffer(2, response.writerIndex())));
+ response.writeByte(0x0D);
+ channel.writeAndFlush(new NetworkMessage(response, remoteAddress));
+ }
+ }
+
+ @Override
+ protected Object decode(
+ Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+ ByteBuf buf = (ByteBuf) msg;
+
+ buf.skipBytes(2); // header
+ int type = buf.readUnsignedByte();
+ buf.readUnsignedShort(); // length
+
+ String imei = ByteBufUtil.hexDump(buf.readSlice(8)).substring(1);
+
+ sendResponse(channel, remoteAddress, type, buf.getByte(buf.writerIndex() - 2));
+
+ if (type == MSG_POSITION_DATA) {
+
+ Position position = new Position(getProtocolName());
+
+ DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, imei);
+ if (deviceSession == null) {
+ return null;
+ }
+ position.setDeviceId(deviceSession.getDeviceId());
+
+ DateBuilder dateBuilder = new DateBuilder()
+ .setYear(BcdUtil.readInteger(buf, 2))
+ .setMonth(BcdUtil.readInteger(buf, 2))
+ .setDay(BcdUtil.readInteger(buf, 2))
+ .setHour(BcdUtil.readInteger(buf, 2))
+ .setMinute(BcdUtil.readInteger(buf, 2))
+ .setSecond(BcdUtil.readInteger(buf, 2));
+ position.setTime(dateBuilder.getDate());
+
+ position.setLatitude(BcdUtil.readCoordinate(buf));
+ position.setLongitude(BcdUtil.readCoordinate(buf));
+ position.setSpeed(UnitsConverter.knotsFromKph(BcdUtil.readInteger(buf, 4)));
+ position.setCourse(BcdUtil.readInteger(buf, 4));
+
+ return position;
+ }
+
+ return null;
+ }
+
+}
diff --git a/src/test/java/org/traccar/protocol/NiotProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/NiotProtocolDecoderTest.java
new file mode 100644
index 000000000..8787e8c51
--- /dev/null
+++ b/src/test/java/org/traccar/protocol/NiotProtocolDecoderTest.java
@@ -0,0 +1,21 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class NiotProtocolDecoderTest extends ProtocolTest {
+
+ @Test
+ public void testDecode() throws Exception {
+
+ NiotProtocolDecoder decoder = new NiotProtocolDecoder(null);
+
+ verifyPosition(decoder, binary(
+ "585880004c08675430355777182005201100468024121b03f390ba00000105f8000b8d207ffc5f0f290084500000000000160001383932353430323130363431363839323430303700050002004e55940d"));
+
+ verifyPosition(decoder, binary(
+ "585880004C08640460465310081912101835080011679303C1E18F00400085F8014FBED87FFC4D15290085501A28000000160001383932353430323131313431323931333238343200050002004E55B40D"));
+
+ }
+
+}