2 files changed, 53 insertions, 1 deletions
diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 1dfe5e3d6..7558b1f31 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -559,7 +559,7 @@ public class ServerManager {
             serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) {
                 @Override
                 protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                    pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(256, 2, 1, 2, 0));
+                    pipeline.addLast("frameDecoder", new Gt06FrameDecoder());
                     pipeline.addLast("objectDecoder", new Gt06ProtocolDecoder(ServerManager.this));
                 }
             });
diff --git a/src/org/traccar/protocol/Gt06FrameDecoder.java b/src/org/traccar/protocol/Gt06FrameDecoder.java
new file mode 100644
index 000000000..bf487dc85
--- /dev/null
+++ b/src/org/traccar/protocol/Gt06FrameDecoder.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2014 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 Gt06FrameDecoder extends FrameDecoder {
+
+    @Override
+    protected Object decode(
+            ChannelHandlerContext ctx,
+            Channel channel,
+            ChannelBuffer buf) throws Exception {
+        
+        // Check minimum length
+        if (buf.readableBytes() < 5) {
+            return null;
+        }
+        
+        int length = 2 + 2; // head and tail
+        
+        if (buf.getByte(buf.readerIndex()) == 0x78) {
+            length += 1 + buf.getByte(buf.readerIndex() + 2);
+        } else {
+            length += 2 + buf.getShort(buf.readerIndex() + 2);
+        }
+        
+        // Check length and return buffer
+        if (buf.readableBytes() >= length) {
+            return buf.readBytes(length);
+        }
+
+        return null;
+    }
+
+}