aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-09-02 03:41:11 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-09-02 03:41:11 +1200
commit8ec8955876bbfaf9e2856ec50f2a011b1dee0eca (patch)
tree60ef7d0150a9e157475757359cd6503a4f2e2481
parent5cbf84b30f9b55f7c199289782b28ac71e0b8776 (diff)
downloadtraccar-server-8ec8955876bbfaf9e2856ec50f2a011b1dee0eca.tar.gz
traccar-server-8ec8955876bbfaf9e2856ec50f2a011b1dee0eca.tar.bz2
traccar-server-8ec8955876bbfaf9e2856ec50f2a011b1dee0eca.zip
Implement Cradlepoint protocol
-rw-r--r--debug.xml1
-rw-r--r--src/org/traccar/protocol/CradlepointProtocol.java47
-rw-r--r--src/org/traccar/protocol/CradlepointProtocolDecoder.java89
-rw-r--r--test/org/traccar/protocol/CradlepointProtocolDecoderTest.java18
4 files changed, 155 insertions, 0 deletions
diff --git a/debug.xml b/debug.xml
index 17a872db6..9e2f495aa 100644
--- a/debug.xml
+++ b/debug.xml
@@ -452,5 +452,6 @@
<entry key='obddongle.port'>5115</entry>
<entry key='hunterpro.port'>5116</entry>
<entry key='raveon.port'>5117</entry>
+ <entry key='cradlepoint.port'>5118</entry>
</properties>
diff --git a/src/org/traccar/protocol/CradlepointProtocol.java b/src/org/traccar/protocol/CradlepointProtocol.java
new file mode 100644
index 000000000..ec938aa39
--- /dev/null
+++ b/src/org/traccar/protocol/CradlepointProtocol.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 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.
+ * 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 org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.handler.codec.frame.LineBasedFrameDecoder;
+import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
+import org.traccar.BaseProtocol;
+import org.traccar.TrackerServer;
+
+import java.util.List;
+
+public class CradlepointProtocol extends BaseProtocol {
+
+ public CradlepointProtocol() {
+ super("cradlepoint");
+ }
+
+ @Override
+ public void initTrackerServers(List<TrackerServer> serverList) {
+ serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) {
+ @Override
+ protected void addSpecificHandlers(ChannelPipeline pipeline) {
+ pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024));
+ pipeline.addLast("stringDecoder", new StringDecoder());
+ pipeline.addLast("stringEncoder", new StringEncoder());
+ pipeline.addLast("objectDecoder", new CradlepointProtocolDecoder(CradlepointProtocol.this));
+ }
+ });
+ }
+
+}
diff --git a/src/org/traccar/protocol/CradlepointProtocolDecoder.java b/src/org/traccar/protocol/CradlepointProtocolDecoder.java
new file mode 100644
index 000000000..4532172c0
--- /dev/null
+++ b/src/org/traccar/protocol/CradlepointProtocolDecoder.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 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.
+ * 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 org.jboss.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.DeviceSession;
+import org.traccar.helper.DateBuilder;
+import org.traccar.helper.Parser;
+import org.traccar.helper.PatternBuilder;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+import java.util.Date;
+import java.util.regex.Pattern;
+
+public class CradlepointProtocolDecoder extends BaseProtocolDecoder {
+
+ public CradlepointProtocolDecoder(CradlepointProtocol protocol) {
+ super(protocol);
+ }
+
+ private static final Pattern PATTERN = new PatternBuilder()
+ .expression("([^,]+),") // id
+ .number("(dd)(dd)(dd),") // time
+ .number("(d+)(dd.d+),") // latitude
+ .expression("([NS]),")
+ .number("(d+)(dd.d+),") // longitude
+ .expression("([EW]),")
+ .number("(d+.d+)?,") // speed
+ .number("(d+.d+)?,") // course
+ .expression("([^,]+),") // carrier
+ .expression("([^,]+)?,") // serdis
+ .number("(-?d+),") // rsrp
+ .number("(-?d+),") // dbm
+ .number("(-?d+),") // rsrq
+ .expression("([^,]+)?,") // ecio
+ .expression("([^,]+)?") // wan ip
+ .compile();
+
+ @Override
+ protected Object decode(
+ Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+ Parser parser = new Parser(PATTERN, (String) msg);
+ if (!parser.matches()) {
+ return null;
+ }
+
+ Position position = new Position();
+ position.setProtocol(getProtocolName());
+
+ DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
+ if (deviceSession == null) {
+ return null;
+ }
+ position.setDeviceId(deviceSession.getDeviceId());
+
+ DateBuilder dateBuilder = new DateBuilder(new Date())
+ .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+ position.setTime(dateBuilder.getDate());
+
+ position.setValid(true);
+ position.setLatitude(parser.nextCoordinate());
+ position.setLongitude(parser.nextCoordinate());
+ position.setSpeed(parser.nextDouble());
+ position.setCourse(parser.nextDouble());
+
+ parser.skip(4);
+
+ position.set(Position.KEY_GSM, parser.next());
+
+ return position;
+ }
+
+}
diff --git a/test/org/traccar/protocol/CradlepointProtocolDecoderTest.java b/test/org/traccar/protocol/CradlepointProtocolDecoderTest.java
new file mode 100644
index 000000000..4f37d3e1e
--- /dev/null
+++ b/test/org/traccar/protocol/CradlepointProtocolDecoderTest.java
@@ -0,0 +1,18 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class CradlepointProtocolDecoderTest extends ProtocolTest {
+
+ @Test
+ public void testDecode() throws Exception {
+
+ CradlepointProtocolDecoder decoder = new CradlepointProtocolDecoder(new CradlepointProtocol());
+
+ verifyPosition(decoder, text(
+ "+12084014675,162658,4337.174385,N,11612.338373,W,0.0,,Verizon,,-71,-44,-11,,"));
+
+ }
+
+}