Implement new Megastek message format

3 files changed, 57 insertions, 2 deletions

diff --git a/src/org/traccar/protocol/MegastekFrameDecoder.java b/src/org/traccar/protocol/MegastekFrameDecoder.java
new file mode 100644
index 000000000..a53468017
--- /dev/null
+++ b/src/org/traccar/protocol/MegastekFrameDecoder.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2015 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;
+import org.traccar.helper.StringFinder;
+
+import java.nio.charset.Charset;
+
+public class MegastekFrameDecoder extends FrameDecoder {
+
+    @Override
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
+
+        if (buf.readableBytes() < 10) {
+            return null;
+        }
+
+        if (Character.isDigit(buf.getByte(buf.readerIndex()))) {
+            int length = 4 + Integer.parseInt(buf.toString(buf.readerIndex(), 4, Charset.defaultCharset()));
+            if (buf.readableBytes() >= length) {
+                return buf.readBytes(length);
+            }
+        } else {
+            int delimiter = buf.indexOf(buf.readerIndex(), buf.writerIndex(), new StringFinder("\r\n"));
+            if (delimiter != -1) {
+                ChannelBuffer result = buf.readBytes(delimiter - buf.readerIndex());
+                buf.skipBytes(2);
+                return result;
+            }
+        }
+
+        return null;
+    }
+
+}
diff --git a/src/org/traccar/protocol/MegastekProtocol.java b/src/org/traccar/protocol/MegastekProtocol.java
index 2a61dfb22..76afc6ad5 100644
--- a/src/org/traccar/protocol/MegastekProtocol.java
+++ b/src/org/traccar/protocol/MegastekProtocol.java
@@ -21,6 +21,7 @@ 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.CharacterDelimiterFrameDecoder;
 import org.traccar.TrackerServer;
 
 import java.util.List;
@@ -36,7 +37,7 @@ public class MegastekProtocol extends BaseProtocol {
         serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) {
             @Override
             protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024));
+                pipeline.addLast("frameDecoder", new MegastekFrameDecoder());
                 pipeline.addLast("stringDecoder", new StringDecoder());
                 pipeline.addLast("stringEncoder", new StringEncoder());
                 pipeline.addLast("objectDecoder", new MegastekProtocolDecoder(MegastekProtocol.this));
diff --git a/src/org/traccar/protocol/MegastekProtocolDecoder.java b/src/org/traccar/protocol/MegastekProtocolDecoder.java
index e28bf6c1d..c212e90fa 100644
--- a/src/org/traccar/protocol/MegastekProtocolDecoder.java
+++ b/src/org/traccar/protocol/MegastekProtocolDecoder.java
@@ -222,6 +222,7 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder {
     }
 
     private static final Pattern PATTERN_NEW = new PatternBuilder()
+            .number("dddd").optional()
             .text("$MGV")
             .number("ddd,")
             .number("(d+),")                     // imei
@@ -342,7 +343,7 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder {
 
         String sentence = (String) msg;
 
-        if (sentence.startsWith("$MG")) {
+        if (sentence.contains("$MG")) {
             return decodeNew(channel, remoteAddress, sentence);
         } else {
             return decodeOld(channel, remoteAddress, sentence);