From e910ee9b63fab3b83efdfb128b81dcf28f6b2251 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 29 Apr 2021 20:16:32 -0700 Subject: Support TAIP prefixes --- src/main/java/org/traccar/config/Keys.java | 9 +++- .../java/org/traccar/protocol/TaipProtocol.java | 7 ++- .../org/traccar/protocol/TaipStringEncoder.java | 52 ++++++++++++++++++++++ 3 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 src/main/java/org/traccar/protocol/TaipStringEncoder.java (limited to 'src') diff --git a/src/main/java/org/traccar/config/Keys.java b/src/main/java/org/traccar/config/Keys.java index d2e5bbd99..e96c6d13a 100644 --- a/src/main/java/org/traccar/config/Keys.java +++ b/src/main/java/org/traccar/config/Keys.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 - 2020 Anton Tananaev (anton@traccar.org) + * Copyright 2019 - 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. @@ -154,6 +154,13 @@ public final class Keys { ".alarmMap", Collections.singletonList(KeyType.GLOBAL)); + /** + * Indicates whether TAIP protocol should have prefixes for messages. + */ + public static final ConfigSuffix PROTOCOL_PREFIX = new ConfigSuffix<>( + ".alarmMap", + Collections.singletonList(KeyType.GLOBAL)); + /** * Some devices require server address confirmation. Use this parameter to configure correct public address. */ diff --git a/src/main/java/org/traccar/protocol/TaipProtocol.java b/src/main/java/org/traccar/protocol/TaipProtocol.java index b8f40a183..5df9f7d3c 100644 --- a/src/main/java/org/traccar/protocol/TaipProtocol.java +++ b/src/main/java/org/traccar/protocol/TaipProtocol.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 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. @@ -16,7 +16,6 @@ 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; @@ -30,7 +29,7 @@ public class TaipProtocol extends BaseProtocol { protected void addProtocolHandlers(PipelineBuilder pipeline) { pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, '<')); pipeline.addLast(new StringDecoder()); - pipeline.addLast(new StringEncoder()); + pipeline.addLast(new TaipStringEncoder(TaipProtocol.this)); pipeline.addLast(new TaipProtocolDecoder(TaipProtocol.this)); } }); @@ -38,7 +37,7 @@ public class TaipProtocol extends BaseProtocol { @Override protected void addProtocolHandlers(PipelineBuilder pipeline) { pipeline.addLast(new StringDecoder()); - pipeline.addLast(new StringEncoder()); + pipeline.addLast(new TaipStringEncoder(TaipProtocol.this)); 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 new file mode 100644 index 000000000..6af35937c --- /dev/null +++ b/src/main/java/org/traccar/protocol/TaipStringEncoder.java @@ -0,0 +1,52 @@ +/* + * 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