diff options
| author | Iván Ávalos <avalos@disroot.org> | 2024-03-07 22:59:12 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2024-03-07 22:59:12 -0600 |
| commit | 00d3ddf7b5e335a5112a28a547c4c9ec2c3bd1d2 (patch) | |
| tree | a02ecb75a8533194314d32c0c667520bff5e919d /src/main/java/org/traccar/protocol/TramigoFrameDecoder.java | |
| parent | 8e1bc703227a875c20e453704d774ce5772f2621 (diff) | |
| parent | 75b404db5c790bf37c05fabf1cbbd2027ad1db25 (diff) | |
| download | trackermap-server-00d3ddf7b5e335a5112a28a547c4c9ec2c3bd1d2.tar.gz trackermap-server-00d3ddf7b5e335a5112a28a547c4c9ec2c3bd1d2.tar.bz2 trackermap-server-00d3ddf7b5e335a5112a28a547c4c9ec2c3bd1d2.zip | |
Merge branch 'master' of https://github.com/traccar/traccar
Diffstat (limited to 'src/main/java/org/traccar/protocol/TramigoFrameDecoder.java')
| -rw-r--r-- | src/main/java/org/traccar/protocol/TramigoFrameDecoder.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/protocol/TramigoFrameDecoder.java b/src/main/java/org/traccar/protocol/TramigoFrameDecoder.java index e4c94dc77..72cadf21a 100644 --- a/src/main/java/org/traccar/protocol/TramigoFrameDecoder.java +++ b/src/main/java/org/traccar/protocol/TramigoFrameDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2019 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2023 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. @@ -29,9 +29,13 @@ public class TramigoFrameDecoder extends BaseFrameDecoder { return null; } + int protocol = buf.getUnsignedByte(buf.readerIndex()); + int length; - if (buf.getUnsignedByte(buf.readerIndex()) == 0x80) { + if (protocol == 0x80) { length = buf.getUnsignedShortLE(buf.readerIndex() + 6); + } else if (protocol == 0x02 || protocol == 0x04) { + length = buf.getUnsignedShortLE(buf.readerIndex() + 1); } else { length = buf.getUnsignedShort(buf.readerIndex() + 6); } |