From a72d9910a7eafbd01c7b730dc94063727a781a6b Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 11 May 2021 21:16:25 -0700 Subject: Fix command encoding --- .../org/traccar/protocol/TaipPrefixEncoder.java | 47 +++++++++++++++++++ .../java/org/traccar/protocol/TaipProtocol.java | 7 ++- .../org/traccar/protocol/TaipStringEncoder.java | 52 ---------------------- 3 files changed, 52 insertions(+), 54 deletions(-) create mode 100644 src/main/java/org/traccar/protocol/TaipPrefixEncoder.java delete mode 100644 src/main/java/org/traccar/protocol/TaipStringEncoder.java (limited to 'src') diff --git a/src/main/java/org/traccar/protocol/TaipPrefixEncoder.java b/src/main/java/org/traccar/protocol/TaipPrefixEncoder.java new file mode 100644 index 000000000..b690c176d --- /dev/null +++ b/src/main/java/org/traccar/protocol/TaipPrefixEncoder.java @@ -0,0 +1,47 @@ +/* + * Copyright 2021 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.buffer.Unpooled; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToMessageEncoder; +import org.traccar.Context; +import org.traccar.Protocol; +import org.traccar.config.Keys; + +import java.util.List; + +@ChannelHandler.Sharable +public class TaipPrefixEncoder extends MessageToMessageEncoder { + + private final Protocol protocol; + + public TaipPrefixEncoder(Protocol protocol) { + this.protocol = protocol; + } + + @Override + protected void encode(ChannelHandlerContext ctx, ByteBuf msg, List out) throws Exception { + if (Context.getConfig().getBoolean(Keys.PROTOCOL_PREFIX.withPrefix(protocol.getName()))) { + Unpooled.wrappedBuffer(Unpooled.wrappedBuffer(new byte[] {0x20, 0x20, 0x06, 0x00}), msg); + } else { + out.add(msg); + } + } + +} diff --git a/src/main/java/org/traccar/protocol/TaipProtocol.java b/src/main/java/org/traccar/protocol/TaipProtocol.java index 5df9f7d3c..0966cfd7c 100644 --- a/src/main/java/org/traccar/protocol/TaipProtocol.java +++ b/src/main/java/org/traccar/protocol/TaipProtocol.java @@ -16,6 +16,7 @@ package org.traccar.protocol; import io.netty.handler.codec.string.StringDecoder; +import io.netty.handler.codec.string.StringEncoder; import org.traccar.BaseProtocol; import org.traccar.CharacterDelimiterFrameDecoder; import org.traccar.PipelineBuilder; @@ -28,16 +29,18 @@ public class TaipProtocol extends BaseProtocol { @Override protected void addProtocolHandlers(PipelineBuilder pipeline) { pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, '<')); + pipeline.addLast(new TaipPrefixEncoder(TaipProtocol.this)); pipeline.addLast(new StringDecoder()); - pipeline.addLast(new TaipStringEncoder(TaipProtocol.this)); + pipeline.addLast(new StringEncoder()); pipeline.addLast(new TaipProtocolDecoder(TaipProtocol.this)); } }); addServer(new TrackerServer(true, getName()) { @Override protected void addProtocolHandlers(PipelineBuilder pipeline) { + pipeline.addLast(new TaipPrefixEncoder(TaipProtocol.this)); pipeline.addLast(new StringDecoder()); - pipeline.addLast(new TaipStringEncoder(TaipProtocol.this)); + pipeline.addLast(new StringEncoder()); pipeline.addLast(new TaipProtocolDecoder(TaipProtocol.this)); } }); diff --git a/src/main/java/org/traccar/protocol/TaipStringEncoder.java b/src/main/java/org/traccar/protocol/TaipStringEncoder.java deleted file mode 100644 index 6af35937c..000000000 --- a/src/main/java/org/traccar/protocol/TaipStringEncoder.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2021 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.buffer.Unpooled; -import io.netty.channel.ChannelHandler; -import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.MessageToMessageEncoder; -import org.traccar.Context; -import org.traccar.Protocol; -import org.traccar.config.Keys; - -import java.nio.charset.StandardCharsets; -import java.util.List; - -@ChannelHandler.Sharable -public class TaipStringEncoder extends MessageToMessageEncoder { - - private final Protocol protocol; - - public TaipStringEncoder(Protocol protocol) { - this.protocol = protocol; - } - - @Override - protected void encode(ChannelHandlerContext ctx, CharSequence msg, List out) throws Exception { - if (msg.length() == 0) { - return; - } - ByteBuf buf = Unpooled.buffer(); - if (Context.getConfig().getBoolean(Keys.PROTOCOL_PREFIX.withPrefix(protocol.getName()))) { - buf.writeBytes(new byte[] {0x20, 0x20, 0x06, 0x00}); - } - buf.writeCharSequence(msg, StandardCharsets.US_ASCII); - out.add(buf); - } - -} -- cgit v1.2.3