From b0151a400565a0affab756ff02e183d269220be9 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 16 Dec 2017 14:38:38 +1300 Subject: Handle short Totem messages --- src/org/traccar/protocol/TotemFrameDecoder.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/org/traccar/protocol/TotemFrameDecoder.java') 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); -- cgit v1.2.3