diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-12-16 14:38:38 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-12-16 14:38:38 +1300 |
| commit | b0151a400565a0affab756ff02e183d269220be9 (patch) | |
| tree | 68e3a2f4280f249e1df110873312b2b1908e99cc | |
| parent | b3e1a81f722ddf93ba70f16686301022bfe2454e (diff) | |
| download | trackermap-server-b0151a400565a0affab756ff02e183d269220be9.tar.gz trackermap-server-b0151a400565a0affab756ff02e183d269220be9.tar.bz2 trackermap-server-b0151a400565a0affab756ff02e183d269220be9.zip | |
Handle short Totem messages
| -rw-r--r-- | src/org/traccar/protocol/TotemFrameDecoder.java | 5 | ||||
| -rw-r--r-- | test/org/traccar/protocol/TotemFrameDecoderTest.java | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/TotemFrameDecoder.java b/src/org/traccar/protocol/TotemFrameDecoder.java index 6c9b14559..70dc5db3b 100644 --- a/src/org/traccar/protocol/TotemFrameDecoder.java +++ b/src/org/traccar/protocol/TotemFrameDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 Anton Tananaev (anton@traccar.org) + * Copyright 2013 - 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. @@ -42,8 +42,7 @@ public class TotemFrameDecoder extends FrameDecoder { int length; - int separatorIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) '|'); - if (separatorIndex > 0 && separatorIndex - beginIndex > 19) { + if (buf.getByte(buf.readerIndex() + 2) == (byte) '0') { length = Integer.parseInt(buf.toString(buf.readerIndex() + 2, 4, StandardCharsets.US_ASCII)); } else { length = Integer.parseInt(buf.toString(buf.readerIndex() + 2, 2, StandardCharsets.US_ASCII), 16); diff --git a/test/org/traccar/protocol/TotemFrameDecoderTest.java b/test/org/traccar/protocol/TotemFrameDecoderTest.java index 2fbb8ec14..0d3e69465 100644 --- a/test/org/traccar/protocol/TotemFrameDecoderTest.java +++ b/test/org/traccar/protocol/TotemFrameDecoderTest.java @@ -12,6 +12,10 @@ public class TotemFrameDecoderTest extends ProtocolTest { TotemFrameDecoder decoder = new TotemFrameDecoder(); verifyFrame( + binary("24243030323542423836323031303033373239343836313345"), + decoder.decode(null, null, binary("24243030323542423836323031303033373239343836313345"))); + + verifyFrame( binary("24243030363545363836313137323033353932363639357c3137303931323135333235372c2d37392e3337333835332c34332e3736353631392c302c302c7c3441"), decoder.decode(null, null, binary("24243030363545363836313137323033353932363639357c3137303931323135333235372c2d37392e3337333835332c34332e3736353631392c302c302c7c3441"))); |