Add M2M mini protocol

4 files changed, 183 insertions, 0 deletions

diff --git a/default.cfg b/default.cfg
index af81dd865..263dc9c92 100644
--- a/default.cfg
+++ b/default.cfg
@@ -278,4 +278,8 @@
     <entry key='noran.enable'>true</entry>
     <entry key='noran.port'>5053</entry>
 
+    <!-- M2M mini server configuration -->
+    <entry key='m2m.enable'>true</entry>
+    <entry key='m2m.port'>5053</entry>
+
 </properties>
diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index f5130816f..e478c6f2f 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -27,6 +27,7 @@ import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import org.jboss.netty.handler.codec.frame.FixedLengthFrameDecoder;
 import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
 import org.jboss.netty.handler.codec.frame.LineBasedFrameDecoder;
 import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
@@ -149,6 +150,7 @@ public class ServerManager {
         initTotemServer("totem");
         initGatorServer("gator");
         initNoranServer("noran");
+        initM2mServer("m2m");
 
         // Initialize web server
         if (Boolean.valueOf(properties.getProperty("http.enable"))) {
@@ -968,4 +970,16 @@ public class ServerManager {
         }
     }
 
+    private void initM2mServer(String protocol) throws SQLException {
+        if (isProtocolEnabled(properties, protocol)) {
+            serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) {
+                @Override
+                protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                    pipeline.addLast("frameDecoder", new FixedLengthFrameDecoder(23));
+                    pipeline.addLast("objectDecoder", new M2mProtocolDecoder(ServerManager.this));
+                }
+            });
+        }
+    }
+
 }
diff --git a/src/org/traccar/protocol/M2mProtocolDecoder.java b/src/org/traccar/protocol/M2mProtocolDecoder.java
new file mode 100644
index 000000000..71ed026ed
--- /dev/null
+++ b/src/org/traccar/protocol/M2mProtocolDecoder.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2013 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 java.util.Calendar;
+import java.util.TimeZone;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.ServerManager;
+import org.traccar.helper.Log;
+import org.traccar.model.ExtendedInfoFormatter;
+import org.traccar.model.Position;
+
+public class M2mProtocolDecoder extends BaseProtocolDecoder {
+
+    public M2mProtocolDecoder(ServerManager serverManager) {
+        super(serverManager);
+    }
+    
+    private boolean firstPacket = true;
+    private Long deviceId;
+
+    @Override
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, Object msg)
+            throws Exception {
+
+        ChannelBuffer buf = (ChannelBuffer) msg;
+
+        // Remove offset
+        for (int i = 0; i < buf.readableBytes(); i++) {
+            int b = buf.getByte(i);
+            if (b != 0x0b) {
+                buf.setByte(i, b - 0x20);
+            }
+        }
+
+        if (firstPacket) {
+            
+            firstPacket = false;
+
+            // Read IMEI
+            StringBuilder imei = new StringBuilder();
+            for (int i = 0; i < 8; i++) {
+                int b = buf.readByte();
+                if (i != 0) {
+                    imei.append(b / 10);
+                }
+                imei.append(b % 10);
+            }
+
+            // Identification
+            try {
+                deviceId = getDataManager().getDeviceByImei(imei.toString()).getId();
+            } catch(Exception error) {
+                Log.warning("Unknown device - " + imei);
+            }
+            
+        } else if (deviceId != null) {
+            
+            // Create new position
+            Position position = new Position();
+            ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("m2m");
+            position.setDeviceId(deviceId);
+
+            // Date and time
+            Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+            time.clear();
+            time.set(Calendar.DAY_OF_MONTH, buf.readUnsignedByte() & 0x3f);
+            time.set(Calendar.MONTH, (buf.readUnsignedByte() & 0x3f) - 1);
+            time.set(Calendar.YEAR, 2000 + buf.readUnsignedByte());
+            time.set(Calendar.HOUR, buf.readUnsignedByte() & 0x3f);
+            time.set(Calendar.MINUTE, buf.readUnsignedByte() & 0x7f);
+            time.set(Calendar.SECOND, buf.readUnsignedByte() & 0x7f);
+            position.setTime(time.getTime());
+            
+            // Location
+            int degrees = buf.readUnsignedByte();
+            double latitude = buf.readUnsignedByte();
+            latitude += buf.readUnsignedByte() / 100.0;
+            latitude += buf.readUnsignedByte() / 10000.0;
+            latitude /= 60;
+            latitude += degrees;
+
+            int b = buf.readUnsignedByte();
+
+            degrees = (b & 0x7f) * 100 + buf.readUnsignedByte();
+            double longitude = buf.readUnsignedByte();
+            longitude += buf.readUnsignedByte() / 100.0;
+            longitude += buf.readUnsignedByte() / 10000.0;
+            longitude /= 60;
+            longitude += degrees;
+            
+            if ((b & 0x80) != 0) {
+                longitude = -longitude;
+            }
+            if ((b & 0x40) != 0) {
+                latitude = -latitude;
+            }
+            
+            position.setLatitude(latitude);
+            position.setLongitude(longitude);
+            position.setSpeed((double) buf.readUnsignedByte());
+            position.setCourse(0.0);
+            position.setAltitude(0.0);
+
+            // Satellites
+            int satellites = buf.readUnsignedByte();
+            if (satellites == 0) {
+                return null; // cell information
+            }
+            extendedInfo.set("satellites", satellites);
+            position.setValid(true);
+
+            // TODO decode everything else
+
+            position.setExtendedInfo(extendedInfo.toString());
+            return position;
+
+        }
+
+        return null;
+    }
+
+}
diff --git a/test/org/traccar/protocol/M2mProtocolDecoderTest.java b/test/org/traccar/protocol/M2mProtocolDecoderTest.java
new file mode 100644
index 000000000..3ea2131c9
--- /dev/null
+++ b/test/org/traccar/protocol/M2mProtocolDecoderTest.java
@@ -0,0 +1,25 @@
+package org.traccar.protocol;
+
+import org.jboss.netty.buffer.ChannelBuffers;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import org.junit.Test;
+import org.traccar.helper.ChannelBufferTools;
+
+public class M2mProtocolDecoderTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        M2mProtocolDecoder decoder = new M2mProtocolDecoder(null);
+        decoder.setDataManager(new TestDataManager());
+
+        int[] buf1 = {0x23,0x5A,0x3C,0x2A,0x26,0x24,0x21,0x5C,0x28,0x7D,0x70,0x21,0x2A,0x21,0x25,0x4C,0x7C,0x64,0x21,0x22,0x0B,0x0B,0x0B};
+        assertNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertArray(buf1))));
+
+        int[] buf2 = {0xA6,0xE1,0x2C,0x2A,0xAA,0xDA,0x46,0x28,0x32,0x6B,0x20,0x59,0x57,0x6E,0x30,0x20,0x2A,0x2F,0xE8,0x5D,0x20,0x20,0x0B};
+        assertNotNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertArray(buf2))));
+
+    }
+
+}