aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-04 16:37:49 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-07-04 16:37:49 +1200
commit9a57e0aaedb24afd3123177e9be931b2ea6ee20f (patch)
tree78610351faf05d5924cc03227e19ebd135006e37
parentbd21690b702b6aeae07b53ac255b8157d07e8f40 (diff)
downloadtrackermap-server-9a57e0aaedb24afd3123177e9be931b2ea6ee20f.tar.gz
trackermap-server-9a57e0aaedb24afd3123177e9be931b2ea6ee20f.tar.bz2
trackermap-server-9a57e0aaedb24afd3123177e9be931b2ea6ee20f.zip
Implement custom HuaSheng frame decoder
-rw-r--r--src/org/traccar/protocol/HuaShengFrameDecoder.java44
-rw-r--r--src/org/traccar/protocol/HuaShengProtocol.java2
-rw-r--r--test/org/traccar/protocol/HuaShengFrameDecoderTest.java24
3 files changed, 69 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/HuaShengFrameDecoder.java b/src/org/traccar/protocol/HuaShengFrameDecoder.java
new file mode 100644
index 000000000..922bc3979
--- /dev/null
+++ b/src/org/traccar/protocol/HuaShengFrameDecoder.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@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.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.codec.frame.FrameDecoder;
+
+public class HuaShengFrameDecoder extends FrameDecoder {
+
+ @Override
+ protected Object decode(
+ ChannelHandlerContext ctx,
+ Channel channel,
+ ChannelBuffer buf) throws Exception {
+
+ if (buf.readableBytes() < 2) {
+ return null;
+ }
+
+ int index = buf.indexOf(buf.readerIndex() + 1, buf.writerIndex(), (byte) 0xC0);
+ if (index != -1) {
+ return buf.readBytes(index + 1 - buf.readerIndex());
+ }
+
+ return null;
+ }
+
+}
diff --git a/src/org/traccar/protocol/HuaShengProtocol.java b/src/org/traccar/protocol/HuaShengProtocol.java
index 7c1d48860..351f886db 100644
--- a/src/org/traccar/protocol/HuaShengProtocol.java
+++ b/src/org/traccar/protocol/HuaShengProtocol.java
@@ -34,7 +34,7 @@ public class HuaShengProtocol extends BaseProtocol {
serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
- pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 3, 2, 0, 0));
+ pipeline.addLast("frameDecoder", new HuaShengFrameDecoder());
pipeline.addLast("objectDecoder", new HuaShengProtocolDecoder(HuaShengProtocol.this));
}
});
diff --git a/test/org/traccar/protocol/HuaShengFrameDecoderTest.java b/test/org/traccar/protocol/HuaShengFrameDecoderTest.java
new file mode 100644
index 000000000..56b8f210c
--- /dev/null
+++ b/test/org/traccar/protocol/HuaShengFrameDecoderTest.java
@@ -0,0 +1,24 @@
+package org.traccar.protocol;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class HuaShengFrameDecoderTest extends ProtocolTest {
+
+ @Test
+ public void testDecode() throws Exception {
+
+ HuaShengFrameDecoder decoder = new HuaShengFrameDecoder();
+
+ Assert.assertEquals(
+ binary("c0010c00120060000000000004000600010100c0"),
+ decoder.decode(null, null, binary("c0010c00120060000000000004000600010100c0")));
+
+ Assert.assertEquals(
+ binary("c0010c003e0002000000000010020012a0014f42445f3347315f56312e302e330013a0043335353835353035303434303635380006a08701000006a0a1035fc0"),
+ decoder.decode(null, null, binary("c0010c003e0002000000000010020012a0014f42445f3347315f56312e302e330013a0043335353835353035303434303635380006a08701000006a0a1035fc0")));
+
+ }
+
+}