From 4d9187e2ee98eee17d4adbcb84379e2c68fe2bcd Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 8 Jun 2018 11:07:43 +1200
Subject: Migrate L, M, N protocols

---
 src/org/traccar/protocol/NavigilFrameDecoder.java | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'src/org/traccar/protocol/NavigilFrameDecoder.java')

diff --git a/src/org/traccar/protocol/NavigilFrameDecoder.java b/src/org/traccar/protocol/NavigilFrameDecoder.java
index 34eb28941..90912fb45 100644
--- a/src/org/traccar/protocol/NavigilFrameDecoder.java
+++ b/src/org/traccar/protocol/NavigilFrameDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Anton Tananaev (anton@traccar.org)
+ * Copyright 2013 - 2018 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,21 +15,19 @@
  */
 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 io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import org.traccar.BaseFrameDecoder;
 
-public class NavigilFrameDecoder extends FrameDecoder {
+public class NavigilFrameDecoder extends BaseFrameDecoder {
 
     private static final int MESSAGE_HEADER = 20;
     private static final long PREAMBLE = 0x2477F5F6;
 
     @Override
     protected Object decode(
-            ChannelHandlerContext ctx,
-            Channel channel,
-            ChannelBuffer buf) throws Exception {
+            ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception {
 
         // Check minimum length
         if (buf.readableBytes() < MESSAGE_HEADER) {
@@ -38,15 +36,15 @@ public class NavigilFrameDecoder extends FrameDecoder {
 
         // Check for preamble
         boolean hasPreamble = false;
-        if (buf.getUnsignedInt(buf.readerIndex()) == PREAMBLE) {
+        if (buf.getUnsignedIntLE(buf.readerIndex()) == PREAMBLE) {
             hasPreamble = true;
         }
 
         // Check length and return buffer
-        int length = buf.getUnsignedShort(buf.readerIndex() + 6);
+        int length = buf.getUnsignedShortLE(buf.readerIndex() + 6);
         if (buf.readableBytes() >= length) {
             if (hasPreamble) {
-                buf.readUnsignedInt();
+                buf.readUnsignedIntLE();
                 length -= 4;
             }
             return buf.readBytes(length);
-- 
cgit v1.2.3