diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-10-30 21:59:36 -0700 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2019-10-30 21:59:36 -0700 |
commit | 7103c6b2f47a5f9281737ca8fc525de644c2aec9 (patch) | |
tree | 1bd20296214ba0dc7205592881f56be0e8e13dd6 /src/main/java/org/traccar/protocol | |
parent | 61b9b7f4bfa23abc477dbd954851fbb479e6513a (diff) | |
download | traccar-server-7103c6b2f47a5f9281737ca8fc525de644c2aec9.tar.gz traccar-server-7103c6b2f47a5f9281737ca8fc525de644c2aec9.tar.bz2 traccar-server-7103c6b2f47a5f9281737ca8fc525de644c2aec9.zip |
Revert "Add PT215 frame decoder"
This reverts commit 14f5711c
Diffstat (limited to 'src/main/java/org/traccar/protocol')
-rw-r--r-- | src/main/java/org/traccar/protocol/Pt215FrameDecoder.java | 55 | ||||
-rw-r--r-- | src/main/java/org/traccar/protocol/Pt215Protocol.java | 3 |
2 files changed, 2 insertions, 56 deletions
diff --git a/src/main/java/org/traccar/protocol/Pt215FrameDecoder.java b/src/main/java/org/traccar/protocol/Pt215FrameDecoder.java deleted file mode 100644 index 0b3bae914..000000000 --- a/src/main/java/org/traccar/protocol/Pt215FrameDecoder.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2019 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.protocol; - -import io.netty.buffer.ByteBuf; -import io.netty.channel.Channel; -import io.netty.channel.ChannelHandlerContext; -import org.traccar.BaseFrameDecoder; - -public class Pt215FrameDecoder extends BaseFrameDecoder { - - private ByteBuf decodeFrame(ByteBuf buf, int length) { - if (buf.readableBytes() >= length) { - return buf.readRetainedSlice(length); - } - return null; - } - - @Override - protected Object decode( - ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception { - - if (buf.readableBytes() < 5) { - return null; - } - - int type = buf.getUnsignedByte(buf.readerIndex() + 2 + 1); - switch (type) { - case Pt215ProtocolDecoder.MSG_LOGIN: - return decodeFrame(buf, 15); - case Pt215ProtocolDecoder.MSG_GPS_REALTIME: - case Pt215ProtocolDecoder.MSG_GPS_OFFLINE: - return decodeFrame(buf, 27); - case Pt215ProtocolDecoder.MSG_STATUS: - return decodeFrame(buf, 11); - default: - return null; - - } - } - -} diff --git a/src/main/java/org/traccar/protocol/Pt215Protocol.java b/src/main/java/org/traccar/protocol/Pt215Protocol.java index 31ddc2c7a..09bd9b121 100644 --- a/src/main/java/org/traccar/protocol/Pt215Protocol.java +++ b/src/main/java/org/traccar/protocol/Pt215Protocol.java @@ -15,6 +15,7 @@ */ package org.traccar.protocol; +import io.netty.handler.codec.LengthFieldBasedFrameDecoder; import org.traccar.BaseProtocol; import org.traccar.PipelineBuilder; import org.traccar.TrackerServer; @@ -25,7 +26,7 @@ public class Pt215Protocol extends BaseProtocol { addServer(new TrackerServer(false, getName()) { @Override protected void addProtocolHandlers(PipelineBuilder pipeline) { - pipeline.addLast(new Pt215FrameDecoder()); + pipeline.addLast(new LengthFieldBasedFrameDecoder(1024, 2, 1, -1, 0)); pipeline.addLast(new Pt215ProtocolDecoder(Pt215Protocol.this)); } }); |