aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2020-02-02 15:04:47 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2020-02-02 15:04:47 -0800
commit468051a44054ce97f28220176e90983825c8d077 (patch)
treeca764289163994a1249bf590eff68484d902eed2
parent230227fde27da2db785d97c6894160b256ad6c10 (diff)
parent4e07d664cac49fcbb47376471ef9f4d770293ba9 (diff)
downloadtraccar-server-468051a44054ce97f28220176e90983825c8d077.tar.gz
traccar-server-468051a44054ce97f28220176e90983825c8d077.tar.bz2
traccar-server-468051a44054ce97f28220176e90983825c8d077.zip
Merge branch 'master' of https://github.com/binakot/traccar into binakot-master
-rw-r--r--src/main/java/org/traccar/handler/protocol/Arnavi4FrameDecoder.java74
-rw-r--r--src/main/java/org/traccar/handler/protocol/Arnavi4Protocol.java45
-rw-r--r--src/main/java/org/traccar/handler/protocol/Arnavi4ProtocolDecoder.java182
-rw-r--r--src/test/java/org/traccar/handler/protocol/Arnavi4FrameDecoderTest.java50
-rw-r--r--src/test/java/org/traccar/handler/protocol/Arnavi4ProtocolDecoderTest.java40
m---------traccar-web0
6 files changed, 391 insertions, 0 deletions
diff --git a/src/main/java/org/traccar/handler/protocol/Arnavi4FrameDecoder.java b/src/main/java/org/traccar/handler/protocol/Arnavi4FrameDecoder.java
new file mode 100644
index 000000000..b13f3fd7d
--- /dev/null
+++ b/src/main/java/org/traccar/handler/protocol/Arnavi4FrameDecoder.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2017 Ivan Muratov (binakot@gmail.com)
+ *
+ * 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 org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.codec.frame.FrameDecoder;
+
+public class Arnavi4FrameDecoder extends FrameDecoder {
+
+ private static final int MIN_LENGTH = 4;
+ private static final int HEADER_LENGTH = 10;
+ private static final int PACKET_WRAPPER_LENGTH = 8;
+ private static final int COMMAND_ANSWER_PACKET_LENGTH = 4;
+ private static final int COMMAND_ANSWER_PARCEL_NUMBER = 0xfd;
+ private static final byte PACKAGE_END_SIGN = 0x5d;
+
+ private boolean firstPacket = true;
+
+ @Override
+ protected Object decode(
+ ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
+
+ if (buf.readableBytes() < MIN_LENGTH) {
+ return null;
+ }
+
+ int length;
+ if (firstPacket) {
+ firstPacket = false;
+ length = HEADER_LENGTH;
+ } else {
+ int index = buf.getUnsignedByte(1); // parcel number
+ if (index == COMMAND_ANSWER_PARCEL_NUMBER) {
+ length = COMMAND_ANSWER_PACKET_LENGTH;
+ } else {
+ int pos = 2; // start sign + parcel number
+ while (pos + PACKET_WRAPPER_LENGTH < buf.readableBytes()
+ && buf.getByte(pos) != PACKAGE_END_SIGN) {
+
+ int dataLength = buf.getUnsignedShort(pos + 1);
+ pos += PACKET_WRAPPER_LENGTH + dataLength; // packet type + data length + unixtime + data + crc
+ }
+
+ if (buf.getByte(pos) != PACKAGE_END_SIGN) { // end sign
+ return null;
+ }
+
+ length = pos + 1;
+ }
+ }
+
+ if (buf.readableBytes() >= length) {
+ return buf.readBytes(length);
+ }
+
+ return null;
+ }
+
+}
diff --git a/src/main/java/org/traccar/handler/protocol/Arnavi4Protocol.java b/src/main/java/org/traccar/handler/protocol/Arnavi4Protocol.java
new file mode 100644
index 000000000..381a9b457
--- /dev/null
+++ b/src/main/java/org/traccar/handler/protocol/Arnavi4Protocol.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2017 Ivan Muratov (binakot@gmail.com)
+ *
+ * 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 org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.traccar.BaseProtocol;
+import org.traccar.TrackerServer;
+
+import java.nio.ByteOrder;
+import java.util.List;
+
+public class Arnavi4Protocol extends BaseProtocol {
+
+ public Arnavi4Protocol() {
+ super("arnavi4");
+ }
+
+ @Override
+ public void initTrackerServers(List<TrackerServer> serverList) {
+ TrackerServer server = new TrackerServer(new ServerBootstrap(), getName()) {
+ @Override
+ protected void addSpecificHandlers(ChannelPipeline pipeline) {
+ pipeline.addLast("frameDecoder", new Arnavi4FrameDecoder());
+ pipeline.addLast("objectDecoder", new Arnavi4ProtocolDecoder(Arnavi4Protocol.this));
+ }
+ };
+ server.setEndianness(ByteOrder.LITTLE_ENDIAN);
+ serverList.add(server);
+ }
+
+}
diff --git a/src/main/java/org/traccar/handler/protocol/Arnavi4ProtocolDecoder.java b/src/main/java/org/traccar/handler/protocol/Arnavi4ProtocolDecoder.java
new file mode 100644
index 000000000..06abb563f
--- /dev/null
+++ b/src/main/java/org/traccar/handler/protocol/Arnavi4ProtocolDecoder.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2017 Ivan Muratov (binakot@gmail.com)
+ *
+ * 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 org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.DeviceSession;
+import org.traccar.helper.Checksum;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+public class Arnavi4ProtocolDecoder extends BaseProtocolDecoder {
+
+ private static final byte HEADER_START_SIGN = (byte) 0xff;
+ private static final byte HEADER_VERSION_1 = 0x22;
+ private static final byte HEADER_VERSION_2 = 0x23;
+
+ private static final byte RECORD_PING = 0x00;
+ private static final byte RECORD_DATA = 0x01;
+ private static final byte RECORD_TEXT = 0x03;
+ private static final byte RECORD_FILE = 0x04;
+ private static final byte RECORD_BINARY = 0x06;
+
+ private static final byte TAG_LATITUDE = 3;
+ private static final byte TAG_LONGITUDE = 4;
+ private static final byte TAG_COORD_PARAMS = 5;
+
+ public Arnavi4ProtocolDecoder(Arnavi4Protocol protocol) {
+ super(protocol);
+ }
+
+ private void sendResponse(Channel channel, byte version, int index) {
+ if (channel != null) {
+ final ChannelBuffer response;
+ if (version == HEADER_VERSION_1) {
+ response = ChannelBuffers.dynamicBuffer(ByteOrder.LITTLE_ENDIAN, 4);
+ response.writeByte(0x7b);
+ response.writeByte(0x00);
+ response.writeByte((byte) index);
+ response.writeByte(0x7d);
+ } else if (version == HEADER_VERSION_2) {
+ response = ChannelBuffers.dynamicBuffer(ByteOrder.LITTLE_ENDIAN, 9);
+ response.writeByte(0x7b);
+ response.writeByte(0x04);
+ response.writeByte(0x00);
+ byte[] timeBytes = ByteBuffer.allocate(4).putInt((int) (System.currentTimeMillis() / 1000)).array();
+ response.writeByte(Checksum.modulo256(timeBytes));
+ response.writeBytes(timeBytes);
+ response.writeByte(0x7d);
+ } else {
+ return; // Ignore unsupported header's versions
+ }
+ channel.write(response);
+ }
+ }
+
+ private Position decodePosition(DeviceSession deviceSession, ChannelBuffer buf, int length, Date time) {
+
+ final Position position = new Position();
+ position.setProtocol(getProtocolName());
+ position.setDeviceId(deviceSession.getDeviceId());
+
+ position.setTime(time);
+
+ int readBytes = 0;
+ while (readBytes < length) {
+ short tag = buf.readUnsignedByte();
+ switch (tag) {
+ case TAG_LATITUDE:
+ position.setLatitude(buf.readFloat());
+ position.setValid(true);
+ break;
+
+ case TAG_LONGITUDE:
+ position.setLongitude(buf.readFloat());
+ position.setValid(true);
+ break;
+
+ case TAG_COORD_PARAMS:
+ position.setCourse(buf.readUnsignedByte() * 2);
+ position.setAltitude(buf.readUnsignedByte() * 10);
+ byte satellites = buf.readByte();
+ position.set(Position.KEY_SATELLITES, satellites & 0x0F + (satellites >> 4) & 0x0F); // gps+glonass
+ position.setSpeed(buf.readUnsignedByte());
+ break;
+
+ default:
+ buf.readBytes(4); // Skip unsupported tags
+ break;
+ }
+
+ readBytes += 5; // 1 byte tag + 4 bytes value
+ }
+
+ return position;
+ }
+
+ @Override
+ protected Object decode(
+ Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+ ChannelBuffer buf = (ChannelBuffer) msg;
+
+ byte startSign = buf.readByte();
+
+ if (startSign == HEADER_START_SIGN) {
+
+ byte version = buf.readByte();
+
+ String imei = String.valueOf(buf.readLong());
+ DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, imei);
+
+ if (deviceSession != null) {
+ sendResponse(channel, version, 0);
+ }
+
+ return null;
+ }
+
+ DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
+ if (deviceSession == null) {
+ return null;
+ }
+
+ List<Position> positions = new LinkedList<>();
+
+ int index = buf.readUnsignedByte();
+
+ byte recordType = buf.readByte();
+ while (buf.readableBytes() > 0) {
+ switch (recordType) {
+ case RECORD_PING:
+ case RECORD_DATA:
+ case RECORD_TEXT:
+ case RECORD_FILE:
+ case RECORD_BINARY:
+ int length = buf.readUnsignedShort();
+ Date time = new Date(buf.readUnsignedInt() * 1000);
+
+ if (recordType == RECORD_DATA) {
+ positions.add(decodePosition(deviceSession, buf, length, time));
+ } else {
+ buf.readBytes(length); // Skip other types of record
+ }
+
+ buf.readUnsignedByte(); // crc
+ break;
+
+ default:
+ return null; // Ignore unsupported types of record
+ }
+
+ recordType = buf.readByte();
+ }
+
+ sendResponse(channel, HEADER_VERSION_1, index);
+
+ return positions;
+ }
+
+}
diff --git a/src/test/java/org/traccar/handler/protocol/Arnavi4FrameDecoderTest.java b/src/test/java/org/traccar/handler/protocol/Arnavi4FrameDecoderTest.java
new file mode 100644
index 000000000..b634f0cdc
--- /dev/null
+++ b/src/test/java/org/traccar/handler/protocol/Arnavi4FrameDecoderTest.java
@@ -0,0 +1,50 @@
+package org.traccar.protocol;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+import java.nio.ByteOrder;
+
+public class Arnavi4FrameDecoderTest extends ProtocolTest {
+
+ @Test
+ public void testDecodeValidPackets() throws Exception {
+
+ Arnavi4FrameDecoder decoder = new Arnavi4FrameDecoder();
+
+ Assert.assertEquals( // Valid HEADER v1 packet with IMEI
+ binary(ByteOrder.LITTLE_ENDIAN, "ff22f30c45f5c90f0300"),
+ decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "ff22f30c45f5c90f0300")));
+
+ Assert.assertEquals( // Valid PACKAGE with one DATA packet
+ binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d"),
+ decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d")));
+
+ Assert.assertEquals( // Valid PACKAGE with two DATA packet
+ binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa3701000029012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d"),
+ decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa3701000029012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d")));
+
+ Assert.assertEquals( // Valid PACKAGE with one TEXT packet.
+ binary(ByteOrder.LITTLE_ENDIAN, "5b01030700e3f16b50747261636361721b5d"),
+ decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01030700e3f16b50747261636361721b5d")));
+
+ Assert.assertEquals( // Valid PACKAGE with two TEXT packet.
+ binary(ByteOrder.LITTLE_ENDIAN, "5b01030700e3f16b50747261636361721b030700e3f16b50747261636361721b5d"),
+ decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01030700e3f16b50747261636361721b030700e3f16b50747261636361721b5d")));
+
+ Assert.assertEquals( // Valid PACKAGE with one BINARY packet.
+ binary(ByteOrder.LITTLE_ENDIAN, "5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d"),
+ decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d")));
+
+ Assert.assertEquals( // Valid PACKAGE with two BINARY packet.
+ binary(ByteOrder.LITTLE_ENDIAN, "5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d"),
+ decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d")));
+
+ Assert.assertEquals( // Valid PACKAGE with answer to server on file transfer
+ binary(ByteOrder.LITTLE_ENDIAN, "5bfd005d"),
+ decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5bfd005d")));
+
+ }
+
+} \ No newline at end of file
diff --git a/src/test/java/org/traccar/handler/protocol/Arnavi4ProtocolDecoderTest.java b/src/test/java/org/traccar/handler/protocol/Arnavi4ProtocolDecoderTest.java
new file mode 100644
index 000000000..d789b1c9c
--- /dev/null
+++ b/src/test/java/org/traccar/handler/protocol/Arnavi4ProtocolDecoderTest.java
@@ -0,0 +1,40 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+import java.nio.ByteOrder;
+
+public class Arnavi4ProtocolDecoderTest extends ProtocolTest {
+
+ @Test
+ public void testHeader1Decode() throws Exception {
+
+ Arnavi4ProtocolDecoder decoder;
+
+ decoder = new Arnavi4ProtocolDecoder(new Arnavi4Protocol());
+
+ verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, // Valid HEADER v1 packet with IMEI
+ "ff22f30c45f5c90f0300"));
+
+ verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, // Valid PACKAGE packet with one DATA packet
+ "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d"),
+ position("2017-07-07 05:09:55.000", true, 45.05597, 39.03347));
+ }
+
+ @Test
+ public void testHeader2Decode() throws Exception {
+
+ Arnavi4ProtocolDecoder decoder;
+
+ decoder = new Arnavi4ProtocolDecoder(new Arnavi4Protocol());
+
+ verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, // Valid HEADER v2 packet with IMEI
+ "ff23f30c45f5c90f0300"));
+
+ verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, // Valid PACKAGE packet with two DATA packet
+ "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa3701000029012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d"),
+ position("2017-07-07 05:09:55.000", true, 45.05597, 39.03347));
+ }
+
+}
diff --git a/traccar-web b/traccar-web
-Subproject c6b57da224d30f48d394b4b0319ca9e30797186
+Subproject 5549ec84fc341b1ea076720e4d18a709573f9ad