aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2020-02-02 16:31:10 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2020-02-02 16:31:10 -0800
commit8b48d8b52f9c29a892dfe4381b3a7226226a76eb (patch)
tree46465ea547576287e16b97c2560d9b5ac4e4c1af
parent71735f0c9b17ad1c64a4335a196b4c765b4499c1 (diff)
downloadtrackermap-server-8b48d8b52f9c29a892dfe4381b3a7226226a76eb.tar.gz
trackermap-server-8b48d8b52f9c29a892dfe4381b3a7226226a76eb.tar.bz2
trackermap-server-8b48d8b52f9c29a892dfe4381b3a7226226a76eb.zip
Switch between binary and text
-rw-r--r--src/main/java/org/traccar/protocol/ArnaviProtocol.java11
-rw-r--r--src/main/java/org/traccar/protocol/ArnaviProtocolDecoder.java49
-rw-r--r--src/main/java/org/traccar/protocol/ArnaviTextProtocolDecoder.java7
-rw-r--r--src/test/java/org/traccar/protocol/ArnaviTextProtocolDecoderTest.java18
4 files changed, 66 insertions, 19 deletions
diff --git a/src/main/java/org/traccar/protocol/ArnaviProtocol.java b/src/main/java/org/traccar/protocol/ArnaviProtocol.java
index 11101097b..aecb42c8c 100644
--- a/src/main/java/org/traccar/protocol/ArnaviProtocol.java
+++ b/src/main/java/org/traccar/protocol/ArnaviProtocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2020 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.
@@ -15,9 +15,6 @@
*/
package org.traccar.protocol;
-import io.netty.handler.codec.LineBasedFrameDecoder;
-import io.netty.handler.codec.string.StringDecoder;
-import io.netty.handler.codec.string.StringEncoder;
import org.traccar.BaseProtocol;
import org.traccar.PipelineBuilder;
import org.traccar.TrackerServer;
@@ -28,10 +25,8 @@ public class ArnaviProtocol extends BaseProtocol {
addServer(new TrackerServer(false, getName()) {
@Override
protected void addProtocolHandlers(PipelineBuilder pipeline) {
- pipeline.addLast(new LineBasedFrameDecoder(1024));
- pipeline.addLast(new StringDecoder());
- pipeline.addLast(new StringEncoder());
- pipeline.addLast(new ArnaviTextProtocolDecoder(ArnaviProtocol.this));
+ pipeline.addLast(new ArnaviFrameDecoder());
+ pipeline.addLast(new ArnaviProtocolDecoder(ArnaviProtocol.this));
}
});
}
diff --git a/src/main/java/org/traccar/protocol/ArnaviProtocolDecoder.java b/src/main/java/org/traccar/protocol/ArnaviProtocolDecoder.java
new file mode 100644
index 000000000..68a70c944
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/ArnaviProtocolDecoder.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2020 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 org.traccar.BaseProtocolDecoder;
+import org.traccar.Protocol;
+
+import java.net.SocketAddress;
+
+public class ArnaviProtocolDecoder extends BaseProtocolDecoder {
+
+ private final ArnaviTextProtocolDecoder textProtocolDecoder;
+ private final ArnaviBinaryProtocolDecoder binaryProtocolDecoder;
+
+ public ArnaviProtocolDecoder(Protocol protocol) {
+ super(protocol);
+ textProtocolDecoder = new ArnaviTextProtocolDecoder(protocol);
+ binaryProtocolDecoder = new ArnaviBinaryProtocolDecoder(protocol);
+ }
+
+ @Override
+ protected Object decode(
+ Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+ ByteBuf buf = (ByteBuf) msg;
+
+ if (buf.getByte(buf.readerIndex()) == '$') {
+ return textProtocolDecoder.decode(channel, remoteAddress, msg);
+ } else {
+ return binaryProtocolDecoder.decode(channel, remoteAddress, msg);
+ }
+ }
+
+}
diff --git a/src/main/java/org/traccar/protocol/ArnaviTextProtocolDecoder.java b/src/main/java/org/traccar/protocol/ArnaviTextProtocolDecoder.java
index 8c4f743bc..b99869e6e 100644
--- a/src/main/java/org/traccar/protocol/ArnaviTextProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/ArnaviTextProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2020 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.
@@ -15,6 +15,7 @@
*/
package org.traccar.protocol;
+import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
import org.traccar.DeviceSession;
@@ -25,6 +26,7 @@ import org.traccar.helper.PatternBuilder;
import org.traccar.model.Position;
import java.net.SocketAddress;
+import java.nio.charset.StandardCharsets;
import java.util.regex.Pattern;
public class ArnaviTextProtocolDecoder extends BaseProtocolDecoder {
@@ -65,7 +67,8 @@ public class ArnaviTextProtocolDecoder extends BaseProtocolDecoder {
protected Object decode(
Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
- Parser parser = new Parser(PATTERN, (String) msg);
+ ByteBuf buf = (ByteBuf) msg;
+ Parser parser = new Parser(PATTERN, buf.toString(StandardCharsets.US_ASCII));
if (!parser.matches()) {
return null;
}
diff --git a/src/test/java/org/traccar/protocol/ArnaviTextProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ArnaviTextProtocolDecoderTest.java
index 065a28580..79179d4f3 100644
--- a/src/test/java/org/traccar/protocol/ArnaviTextProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/ArnaviTextProtocolDecoderTest.java
@@ -10,31 +10,31 @@ public class ArnaviTextProtocolDecoderTest extends ProtocolTest {
ArnaviTextProtocolDecoder decoder = new ArnaviTextProtocolDecoder(null);
- verifyPosition(decoder, text(
+ verifyPosition(decoder, buffer(
"$AV,V4,999999,12487,2277,203,65534,0,0,193,65535,65535,65535,65535,1,13,80.0,56.1,200741,5950.6773N,03029.1043E,300.0,360.0,121012,65535,65535,65535,SF*6E"));
- verifyNull(decoder, text(
+ verifyNull(decoder, buffer(
"$AV,V3DI,85164,20707,-1,19,0008C56A,000879AC,0C000002,863071013041618,89997077111301204297,*0B"));
- verifyNull(decoder, text(
+ verifyNull(decoder, buffer(
"$AV,V6SD,85164,20708,-1,3,6,37,33,*52"));
- verifyAttributes(decoder, text(
+ verifyAttributes(decoder, buffer(
"$AV,V4,85164,20709,1148,418,-1,0,1,192,0,0,0,0,0,0,,,000023,0000.0000N,00000.0000E,0.0,0.0,060180,0,0,32767,*4F"));
- verifyNull(decoder, text(
+ verifyNull(decoder, buffer(
"$AV,V3GSMINFO,85164,-1,20450,KMOBILE,1,2,1,23,0,40101,cc3,1,ce19,401,16,65304,5613,72,,SF*7F"));
- verifyAttributes(decoder, text(
+ verifyAttributes(decoder, buffer(
"$AV,V4,85164,20451,1146,418,-1,1,1,192,0,0,0,0,0,0,,,104340,0000.0000N,00000.0000E,0.0,0.0,060219,11,0,32767,,SF*47"));
- verifyNull(decoder, text(
+ verifyNull(decoder, buffer(
"$AV,V6SD,85164,20452,-1,3,3,5,6769,,SF*5D"));
- verifyPosition(decoder, text(
+ verifyPosition(decoder, buffer(
"$AV,V2,32768,12487,2277,203,-1,0,0,193,0,0,1,13,200741,5950.6773N,03029.1043E,0.0,0.0,121012,*6E"));
- verifyPosition(decoder, text(
+ verifyPosition(decoder, buffer(
"$AV,V3,999999,12487,2277,203,65534,0,0,193,65535,65535,65535,65535,1,13,200741,5950.6773N,03029.1043E,300.0,360.0,121012,65535,65535,65535,SF*6E"));
}