Workaround for meiligao protocol (fix #130)

3 files changed, 52 insertions, 18 deletions

diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 2fb9f3f6b..aa30bab30 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -369,7 +369,7 @@ public class ServerManager {
             serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) {
                 @Override
                 protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                    pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 2, 2, -4, 4));
+                    pipeline.addLast("frameDecoder", new MeiligaoFrameDecoder());
                     pipeline.addLast("objectDecoder", new MeiligaoProtocolDecoder(ServerManager.this));
                 }
             });
diff --git a/src/org/traccar/protocol/MeiligaoFrameDecoder.java b/src/org/traccar/protocol/MeiligaoFrameDecoder.java
new file mode 100644
index 000000000..ad1db6c89
--- /dev/null
+++ b/src/org/traccar/protocol/MeiligaoFrameDecoder.java
@@ -0,0 +1,50 @@
+/*
+ * 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 org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.codec.frame.FrameDecoder;
+
+public class MeiligaoFrameDecoder extends FrameDecoder {
+    
+    private static final int MESSAGE_HEADER = 4;
+
+    @Override
+    protected Object decode(
+            ChannelHandlerContext ctx,
+            Channel channel,
+            ChannelBuffer buf) throws Exception {
+        
+        // Strip not '$' (0x24) bytes from the beginning
+        while (buf.readable() && buf.getUnsignedByte(buf.readerIndex()) != 0x24) {
+            buf.readByte();
+        }
+        
+        // Check length and return buffer
+        if (buf.readableBytes() >= MESSAGE_HEADER) {
+            int length = buf.getUnsignedShort(buf.readerIndex() + 2);
+            if (buf.readableBytes() >= length) {
+                buf.skipBytes(MESSAGE_HEADER);
+                return buf.readBytes(length - MESSAGE_HEADER);
+            }
+        }
+
+        return null;
+    }
+
+}
diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
index 98e4b5ef1..f40d64b26 100644
--- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
@@ -29,18 +29,10 @@ import org.traccar.BaseProtocolDecoder;
 import org.traccar.ServerManager;
 import org.traccar.helper.Crc;
 import org.traccar.helper.Log;
-import org.traccar.model.DataManager;
-import org.traccar.model.Device;
 import org.traccar.model.Position;
 
-/**
- * Meiligao protocol decoder
- */
 public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
 
-    /**
-     * Initialize
-     */
     public MeiligaoProtocolDecoder(ServerManager serverManager) {
         super(serverManager);
     }
@@ -48,10 +40,6 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
     /**
      * Regular expressions pattern
      */
-    //                             | HDOP | Altitude | State | AD| BASE ID | CSQ | Journey
-    //"191020.000,A,2438.1016,S,02553.3551,E,0.00,,150113,,,A*69    |1.7|1009|"
-    //"020600.930,A,2309.2051,N,11318.8449,E,0.00,0.00,090710,,,A*6A|2.6|96.7|0000|0000,3FFF|000000000"
-    //"155422.000,V,2230.7623,N,11403.4218,E,0.00,0,060211,,*1A     |0.0|26  |0000|0000,0000|0000000000000000|63|00000000"
     static private Pattern pattern = Pattern.compile(
             "(\\d{2})(\\d{2})(\\d{2})\\.(\\d{3})," + // Time (HHMMSS.SSS)
             "([AV])," +                         // Validity
@@ -142,13 +130,9 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
         StringBuilder extendedInfo = new StringBuilder("<protocol>meiligao</protocol>");
 
         // Get device by id
-        // TODO: change imei to unique id
         String id = getId(buf);
         try {
-            DataManager dm = getDataManager();
-            Device d = dm.getDeviceByImei(id);
-            d.getId();
-            //position.setDeviceId(getDataManager().getDeviceByImei(id).getId());
+            position.setDeviceId(getDataManager().getDeviceByImei(id).getId());
         } catch(Exception error) {
             Log.warning("Unknown device - " + id);
             return null;