aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-05-31 21:21:20 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2017-05-31 21:21:20 +1200
commitea8730325866dbe61e873adcfc8d5875bf7b9be1 (patch)
treede006b7e2b206918a98c5d0d9b850ef3809ce0df
parentc3be37febe85bbaa69b7112f6d9a04b19b8b9253 (diff)
downloadtrackermap-server-ea8730325866dbe61e873adcfc8d5875bf7b9be1.tar.gz
trackermap-server-ea8730325866dbe61e873adcfc8d5875bf7b9be1.tar.bz2
trackermap-server-ea8730325866dbe61e873adcfc8d5875bf7b9be1.zip
Implement custom Watch frame decoder
-rw-r--r--src/org/traccar/protocol/WatchFrameDecoder.java46
-rw-r--r--src/org/traccar/protocol/WatchProtocol.java4
-rw-r--r--test/org/traccar/protocol/WatchFrameDecoderTest.java24
-rw-r--r--test/org/traccar/protocol/WatchProtocolDecoderTest.java2
4 files changed, 73 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/WatchFrameDecoder.java b/src/org/traccar/protocol/WatchFrameDecoder.java
new file mode 100644
index 000000000..b02048079
--- /dev/null
+++ b/src/org/traccar/protocol/WatchFrameDecoder.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017 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 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;
+
+import java.nio.charset.StandardCharsets;
+
+public class WatchFrameDecoder extends FrameDecoder {
+
+ private static final int MESSAGE_HEADER = 20;
+
+ @Override
+ protected Object decode(
+ ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
+
+ if (buf.readableBytes() >= MESSAGE_HEADER) {
+ ChannelBuffer lengthBuffer = ChannelBuffers.dynamicBuffer();
+ buf.getBytes(buf.readerIndex() + MESSAGE_HEADER - 4 - 1, lengthBuffer, 4);
+ int length = Integer.parseInt(lengthBuffer.toString(StandardCharsets.US_ASCII), 16) + MESSAGE_HEADER + 1;
+ if (buf.readableBytes() >= length) {
+ return buf.readBytes(length);
+ }
+ }
+
+ return null;
+ }
+
+}
diff --git a/src/org/traccar/protocol/WatchProtocol.java b/src/org/traccar/protocol/WatchProtocol.java
index f664691c3..72a260423 100644
--- a/src/org/traccar/protocol/WatchProtocol.java
+++ b/src/org/traccar/protocol/WatchProtocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 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.
@@ -51,7 +51,7 @@ public class WatchProtocol extends BaseProtocol {
serverList.add(new TrackerServer(new ServerBootstrap(), getName()) {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
- pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, ']'));
+ pipeline.addLast("frameDecoder", new WatchFrameDecoder());
pipeline.addLast("stringEncoder", new StringEncoder());
pipeline.addLast("stringDecoder", new StringDecoder());
pipeline.addLast("objectEncoder", new WatchProtocolEncoder());
diff --git a/test/org/traccar/protocol/WatchFrameDecoderTest.java b/test/org/traccar/protocol/WatchFrameDecoderTest.java
new file mode 100644
index 000000000..c705b24b3
--- /dev/null
+++ b/test/org/traccar/protocol/WatchFrameDecoderTest.java
@@ -0,0 +1,24 @@
+package org.traccar.protocol;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class WatchFrameDecoderTest extends ProtocolTest {
+
+ @Test
+ public void testDecode() throws Exception {
+
+ WatchFrameDecoder decoder = new WatchFrameDecoder();
+
+ Assert.assertEquals(
+ binary("5b33472a383330383430363237392a303030382a72636170747572655d"),
+ decoder.decode(null, null, binary("5b33472a383330383430363237392a303030382a72636170747572655d")));
+
+ Assert.assertEquals(
+ binary("5b33472a383330383430363237392a303030392a4c4b2c302c302c38345d"),
+ decoder.decode(null, null, binary("5b33472a383330383430363237392a303030392a4c4b2c302c302c38345d")));
+
+ }
+
+}
diff --git a/test/org/traccar/protocol/WatchProtocolDecoderTest.java b/test/org/traccar/protocol/WatchProtocolDecoderTest.java
index f624988d4..0961dcd50 100644
--- a/test/org/traccar/protocol/WatchProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/WatchProtocolDecoderTest.java
@@ -45,7 +45,7 @@ public class WatchProtocolDecoderTest extends ProtocolTest {
"[3G*2256002206*0079*UD2,100116,153723,A,38.000000,N,-9.000000,W,0.44,299.3,0.0,7,100,86,0,0,00000008,2,0,268,3,3010,51042,146,3010,51043,132]"));
verifyNull(decoder, text(
- "[3G*8800000015*0003*TKQ"));
+ "[3G*8800000015*0003*TKQ]"));
verifyPosition(decoder, text(
"[3G*4700186508*00B1*UD,301015,084840,V,45.853100,N,14.6224899,E,0.00,0.0,0.0,0,84,61,0,11,00000008,7,255,293,70,60,6453,139,60,6432,139,60,6431,132,60,6457,127,60,16353,126,60,6451,121,60,16352,118]"));