1 files changed, 18 insertions, 13 deletions

diff --git a/src/org/traccar/protocol/WatchFrameDecoder.java b/src/org/traccar/protocol/WatchFrameDecoder.java
index 9adea2843..1e2f0cea3 100644
--- a/src/org/traccar/protocol/WatchFrameDecoder.java
+++ b/src/org/traccar/protocol/WatchFrameDecoder.java
@@ -15,19 +15,20 @@
  */
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
 
 import java.nio.charset.StandardCharsets;
 
-public class WatchFrameDecoder extends FrameDecoder {
+import org.traccar.BaseFrameDecoder;
+
+public class WatchFrameDecoder extends BaseFrameDecoder {
 
     @Override
     protected Object decode(
-            ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
+            ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception {
 
         int idIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) '*') + 1;
         if (idIndex <= 0) {
@@ -37,11 +38,6 @@ public class WatchFrameDecoder extends FrameDecoder {
         int lengthIndex = buf.indexOf(idIndex, buf.writerIndex(), (byte) '*') + 1;
         if (lengthIndex <= 0) {
             return null;
-        } else if (lengthIndex - idIndex > 10 + 1) {
-            lengthIndex = buf.indexOf(lengthIndex, buf.writerIndex(), (byte) '*') + 1;
-            if (lengthIndex <= 0) {
-                return null;
-            }
         }
 
         int payloadIndex = buf.indexOf(lengthIndex, buf.writerIndex(), (byte) '*');
@@ -49,10 +45,19 @@ public class WatchFrameDecoder extends FrameDecoder {
             return null;
         }
 
+        if (payloadIndex + 5 < buf.writerIndex() && buf.getByte(payloadIndex + 5) == '*'
+                && buf.toString(payloadIndex + 1, 4, StandardCharsets.US_ASCII).matches("\\p{XDigit}+")) {
+            lengthIndex = payloadIndex + 1;
+            payloadIndex = buf.indexOf(lengthIndex, buf.writerIndex(), (byte) '*');
+            if (payloadIndex < 0) {
+                return null;
+            }
+        }
+
         int length = Integer.parseInt(
                 buf.toString(lengthIndex, payloadIndex - lengthIndex, StandardCharsets.US_ASCII), 16);
         if (buf.readableBytes() >= payloadIndex + 1 + length + 1) {
-            ChannelBuffer frame = ChannelBuffers.dynamicBuffer();
+            ByteBuf frame = Unpooled.buffer();
             int endIndex = buf.readerIndex() + payloadIndex + 1 + length + 1;
             while (buf.readerIndex() < endIndex) {
                 byte b = buf.readByte();