aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-04-01 14:31:21 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-04-01 14:31:21 +1300
commitdb0ba9badfca80b51acd50a83b8ee7abd5d31522 (patch)
treea70070d9650959cb3f2ae39a9c2aff895ecc3aed /src/org/traccar/protocol
parenteb5fbb9f8ba1a798949e2b881b8268ff151aaeb6 (diff)
downloadtraccar-server-db0ba9badfca80b51acd50a83b8ee7abd5d31522.tar.gz
traccar-server-db0ba9badfca80b51acd50a83b8ee7abd5d31522.tar.bz2
traccar-server-db0ba9badfca80b51acd50a83b8ee7abd5d31522.zip
Add support for OpenGTS format (fix #1836)
Diffstat (limited to 'src/org/traccar/protocol')
-rw-r--r--src/org/traccar/protocol/T55Protocol.java11
-rw-r--r--src/org/traccar/protocol/T55ProtocolDecoder.java4
2 files changed, 13 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/T55Protocol.java b/src/org/traccar/protocol/T55Protocol.java
index 041413a65..3fa0f6a9e 100644
--- a/src/org/traccar/protocol/T55Protocol.java
+++ b/src/org/traccar/protocol/T55Protocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
*
* 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 org.jboss.netty.bootstrap.ConnectionlessBootstrap;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.handler.codec.frame.LineBasedFrameDecoder;
@@ -42,6 +43,14 @@ public class T55Protocol extends BaseProtocol {
pipeline.addLast("objectDecoder", new T55ProtocolDecoder(T55Protocol.this));
}
});
+ serverList.add(new TrackerServer(new ConnectionlessBootstrap(), this.getName()) {
+ @Override
+ protected void addSpecificHandlers(ChannelPipeline pipeline) {
+ pipeline.addLast("stringEncoder", new StringEncoder());
+ pipeline.addLast("stringDecoder", new StringDecoder());
+ pipeline.addLast("objectDecoder", new T55ProtocolDecoder(T55Protocol.this));
+ }
+ });
}
}
diff --git a/src/org/traccar/protocol/T55ProtocolDecoder.java b/src/org/traccar/protocol/T55ProtocolDecoder.java
index 813d58ba8..c5704cd56 100644
--- a/src/org/traccar/protocol/T55ProtocolDecoder.java
+++ b/src/org/traccar/protocol/T55ProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -219,6 +219,8 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder {
String id = sentence.substring(0, index);
if (id.endsWith(",")) {
id = id.substring(0, id.length() - 1);
+ } else if (id.endsWith("/")) {
+ id = id.substring(id.indexOf('/') + 1, id.length() - 1);
}
identify(id, channel, remoteAddress);
sentence = sentence.substring(index);