Start Smokey protocol implementation

6 files changed, 158 insertions, 0 deletions

diff --git a/debug.xml b/debug.xml
index d01a25248..a529af327 100644
--- a/debug.xml
+++ b/debug.xml
@@ -482,5 +482,6 @@
     <entry key='jpkorjar.port'>5122</entry>
     <entry key='cguard.port'>5123</entry>
     <entry key='fifotrack.port'>5124</entry>
+    <entry key='smokey.port'>5125</entry>
 
 </properties>
diff --git a/src/org/traccar/helper/DateBuilder.java b/src/org/traccar/helper/DateBuilder.java
index c52210326..bf4432efc 100644
--- a/src/org/traccar/helper/DateBuilder.java
+++ b/src/org/traccar/helper/DateBuilder.java
@@ -92,6 +92,11 @@ public class DateBuilder {
         return this;
     }
 
+    public DateBuilder addSeconds(long seconds) {
+        calendar.setTimeInMillis(calendar.getTimeInMillis() + seconds * 1000);
+        return this;
+    }
+
     public DateBuilder setMillis(int millis) {
         calendar.set(Calendar.MILLISECOND, millis);
         return this;
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index c1058aef9..a1423993b 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -35,6 +35,7 @@ public class Position extends Message {
     public static final String KEY_OUTPUT = "output";
     public static final String KEY_POWER = "power";
     public static final String KEY_BATTERY = "battery";
+    public static final String KEY_CELL_TOWERS = "cellTowers";
     public static final String KEY_MCC = "mcc";
     public static final String KEY_MNC = "mnc";
     public static final String KEY_LAC = "lac";
diff --git a/src/org/traccar/protocol/SmokeyProtocol.java b/src/org/traccar/protocol/SmokeyProtocol.java
new file mode 100644
index 000000000..bb7b91fad
--- /dev/null
+++ b/src/org/traccar/protocol/SmokeyProtocol.java
@@ -0,0 +1,41 @@
+/*
+ * 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.ConnectionlessBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.traccar.BaseProtocol;
+import org.traccar.TrackerServer;
+
+import java.util.List;
+
+public class SmokeyProtocol extends BaseProtocol {
+
+    public SmokeyProtocol() {
+        super("smokey");
+    }
+
+    @Override
+    public void initTrackerServers(List<TrackerServer> serverList) {
+        serverList.add(new TrackerServer(new ConnectionlessBootstrap(), getName()) {
+            @Override
+            protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                pipeline.addLast("objectDecoder", new SmokeyProtocolDecoder(SmokeyProtocol.this));
+            }
+        });
+    }
+
+}
diff --git a/src/org/traccar/protocol/SmokeyProtocolDecoder.java b/src/org/traccar/protocol/SmokeyProtocolDecoder.java
new file mode 100644
index 000000000..c4b2b4c67
--- /dev/null
+++ b/src/org/traccar/protocol/SmokeyProtocolDecoder.java
@@ -0,0 +1,83 @@
+/*
+ * 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.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.DeviceSession;
+import org.traccar.helper.DateBuilder;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+
+public class SmokeyProtocolDecoder extends BaseProtocolDecoder {
+
+    public SmokeyProtocolDecoder(SmokeyProtocol protocol) {
+        super(protocol);
+    }
+
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+        ChannelBuffer buf = (ChannelBuffer) msg;
+
+        buf.skipBytes(2); // header
+        buf.readUnsignedByte(); // protocol version
+
+        String id = ChannelBuffers.hexDump(buf.readBytes(8));
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, id);
+        if (deviceSession == null) {
+            return null;
+        }
+
+        int type = buf.readUnsignedByte();
+
+        if (type == 0) {
+
+            if (channel != null) {
+                // TODO send ack
+            }
+
+            Position position = new Position();
+            position.setProtocol(getProtocolName());
+            position.setDeviceId(deviceSession.getDeviceId());
+
+            position.set(Position.KEY_STATUS, buf.readUnsignedByte());
+
+            DateBuilder dateBuilder = new DateBuilder()
+                    .setDate(2000, 1, 1).addSeconds(buf.readUnsignedInt());
+
+            getLastLocation(position, dateBuilder.getDate());
+
+            position.set(Position.KEY_INDEX, buf.readUnsignedByte());
+
+            buf.readUnsignedShort(); // task / parameter number
+
+            buf.readUnsignedShort(); // length
+
+            // data
+
+            return position;
+
+        }
+
+        return null;
+    }
+
+}
diff --git a/test/org/traccar/protocol/SmokeyProtocolDecoderTest.java b/test/org/traccar/protocol/SmokeyProtocolDecoderTest.java
new file mode 100644
index 000000000..01950fdb5
--- /dev/null
+++ b/test/org/traccar/protocol/SmokeyProtocolDecoderTest.java
@@ -0,0 +1,27 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class SmokeyProtocolDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        SmokeyProtocolDecoder decoder = new SmokeyProtocolDecoder(new SmokeyProtocol());
+
+        verifyNothing(decoder, binary(
+                "534d0300865628025163272f031400000000001c000200000c0168028f000102c9f93a011f538d"));
+
+        verifyNothing(decoder, binary(
+                "534d0300865628025163272f031400000000001f000200000c0167028f000102c9f93a011f5082"));
+
+        verifyNothing(decoder, binary(
+                "534d0300865628025163272f031400000000001d000200000c0167028f000102c9f93a011f5282"));
+
+        verifyNothing(decoder, binary(
+                "534d0300865628025163272f031400000000001e000200000c0167028f000102c9f93a011f5182"));
+
+    }
+
+}