From 0bbf4169c0b0ebd0cc5797d756350f7a7e57831a Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 13 Dec 2015 09:41:37 +1300 Subject: Add new format to Totem frame decoder --- src/org/traccar/protocol/TotemFrameDecoder.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/org/traccar/protocol') diff --git a/src/org/traccar/protocol/TotemFrameDecoder.java b/src/org/traccar/protocol/TotemFrameDecoder.java index d6a456850..83c328173 100644 --- a/src/org/traccar/protocol/TotemFrameDecoder.java +++ b/src/org/traccar/protocol/TotemFrameDecoder.java @@ -39,7 +39,15 @@ public class TotemFrameDecoder extends FrameDecoder { buf.readerIndex(beginIndex); } - int length = Integer.parseInt(buf.toString(buf.readerIndex() + 2, 2, Charset.defaultCharset()), 16); + int length; + + int flagIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), new StringFinder("AA")); + if (flagIndex != -1 && flagIndex - beginIndex == 6) { + length = Integer.parseInt(buf.toString(buf.readerIndex() + 2, 4, Charset.defaultCharset())); + } else { + length = Integer.parseInt(buf.toString(buf.readerIndex() + 2, 2, Charset.defaultCharset()), 16); + } + if (length <= buf.readableBytes()) { return buf.readBytes(length); } -- cgit v1.2.3