aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-10-11 23:23:33 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2013-10-11 23:23:33 +1300
commit6f177f5ceb8c8ce9af7be71effd1855dc764507a (patch)
tree7dd3abf674cf1be3729a0e1031a7f935747b4e2b
parentef6d4a8fad783e3ce6e657cd1b47accf2ae3f6ef (diff)
downloadtrackermap-server-6f177f5ceb8c8ce9af7be71effd1855dc764507a.tar.gz
trackermap-server-6f177f5ceb8c8ce9af7be71effd1855dc764507a.tar.bz2
trackermap-server-6f177f5ceb8c8ce9af7be71effd1855dc764507a.zip
Fix atrack frame decoder
-rw-r--r--src/org/traccar/protocol/AtrackFrameDecoder.java2
-rw-r--r--test/org/traccar/protocol/AtrackProtocolDecoderTest.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/AtrackFrameDecoder.java b/src/org/traccar/protocol/AtrackFrameDecoder.java
index 970ddc66b..267b6de12 100644
--- a/src/org/traccar/protocol/AtrackFrameDecoder.java
+++ b/src/org/traccar/protocol/AtrackFrameDecoder.java
@@ -35,7 +35,7 @@ public class AtrackFrameDecoder extends LengthFieldBasedFrameDecoder {
ChannelBuffer buf) throws Exception {
// Keep alive message
- if (buf.readableBytes() >= KEEPALIVE_LENGTH ||
+ if (buf.readableBytes() >= KEEPALIVE_LENGTH &&
buf.getUnsignedShort(buf.readerIndex()) == 0xfe02) {
channel.write(buf.readBytes(KEEPALIVE_LENGTH));
}
diff --git a/test/org/traccar/protocol/AtrackProtocolDecoderTest.java b/test/org/traccar/protocol/AtrackProtocolDecoderTest.java
index a9e919726..ccead9859 100644
--- a/test/org/traccar/protocol/AtrackProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/AtrackProtocolDecoderTest.java
@@ -17,6 +17,9 @@ public class AtrackProtocolDecoderTest {
//int[] buf1 = {0xfe,0x02,0x00,0x01,0x41,0x04,0xd8,0xf1,0x96,0x82,0x00,0x01};
//assertNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertArray(buf1))));
+ int[] buf2 = {0x40,0x50,0x99,0x3f,0x00,0x5c,0x00,0x02,0x00,0x01,0x41,0x04,0xd8,0xf1,0x96,0x82,0x52,0x56,0x66,0xc2,0x52,0x56,0x8c,0x3c,0x52,0x56,0x8c,0x63,0xff,0xc8,0x33,0x84,0x02,0x69,0x88,0x85,0x00,0x00,0x02,0x00,0x00,0x09,0xcf,0x03,0xde,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0xd0,0x07,0xd0,0x00,0x52,0x56,0x66,0xc2,0x52,0x56,0x8c,0x5a,0x52,0x56,0x8c,0x63,0xff,0xc8,0x33,0x84,0x02,0x69,0x88,0x85,0x00,0x00,0x02,0x00,0x00,0x09,0xcf,0x03,0xde,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0xd0,0x07,0xd0,0x00};
+ assertNotNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertArray(buf2))));
+
}
}