diff options
| author | casswarry0 <casswarry0@gmail.com> | 2023-01-17 17:14:53 -0700 |
|---|---|---|
| committer | casswarry0 <casswarry0@gmail.com> | 2023-01-17 17:14:53 -0700 |
| commit | 7338b8730949ed027b3f8b31d7dca20687ebbb8b (patch) | |
| tree | c2d171e6121818ab511460a786f69aab97a2a628 /src/main/java/org/traccar/protocol/NavtelecomFrameDecoder.java | |
| parent | cdecd3fa4427a382c0b09f8ad9d69ec14388960a (diff) | |
| parent | 85501f9cf4918d5eee345f83aed7a31eecb26b8d (diff) | |
| download | trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.tar.gz trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.tar.bz2 trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'src/main/java/org/traccar/protocol/NavtelecomFrameDecoder.java')
| -rw-r--r-- | src/main/java/org/traccar/protocol/NavtelecomFrameDecoder.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/protocol/NavtelecomFrameDecoder.java b/src/main/java/org/traccar/protocol/NavtelecomFrameDecoder.java index 0fb82528b..2ab7d11a9 100644 --- a/src/main/java/org/traccar/protocol/NavtelecomFrameDecoder.java +++ b/src/main/java/org/traccar/protocol/NavtelecomFrameDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2021 Anton Tananaev (anton@traccar.org) + * Copyright 2021 - 2022 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. @@ -30,7 +30,12 @@ public class NavtelecomFrameDecoder extends BaseFrameDecoder { protected Object decode( ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception { - if (buf.getByte(buf.readerIndex()) == '@') { + if (buf.getByte(buf.readerIndex()) == 0x7f) { + + buf.skipBytes(1); + return null; + + } else if (buf.getByte(buf.readerIndex()) == '@') { int length = buf.getUnsignedShortLE(12) + 12 + 2 + 2; if (buf.readableBytes() >= length) { |