Migrate O and P protocols

1 files changed, 38 insertions, 38 deletions

diff --git a/src/org/traccar/protocol/ProgressProtocolDecoder.java b/src/org/traccar/protocol/ProgressProtocolDecoder.java
index d85b6acb3..d7e67df30 100644
--- a/src/org/traccar/protocol/ProgressProtocolDecoder.java
+++ b/src/org/traccar/protocol/ProgressProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2014 Anton Tananaev (anton@traccar.org)
+ * Copyright 2012 - 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,16 +15,17 @@
  */
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
 import org.traccar.DeviceSession;
+import org.traccar.NetworkMessage;
 import org.traccar.helper.BitUtil;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
-import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.LinkedList;
@@ -53,12 +54,12 @@ public class ProgressProtocolDecoder extends BaseProtocolDecoder {
         if (lastIndex == 0) {
             lastIndex = newIndex;
         } else if (newIndex > lastIndex) {
-            ChannelBuffer request = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, 12);
-            request.writeShort(MSG_LOG_SYNC);
-            request.writeShort(4);
-            request.writeInt((int) lastIndex);
-            request.writeInt(0);
-            channel.write(request);
+            ByteBuf request = Unpooled.buffer(12);
+            request.writeShortLE(MSG_LOG_SYNC);
+            request.writeShortLE(4);
+            request.writeIntLE((int) lastIndex);
+            request.writeIntLE(0);
+            channel.writeAndFlush(new NetworkMessage(request, channel.remoteAddress()));
         }
     }
 
@@ -66,18 +67,18 @@ public class ProgressProtocolDecoder extends BaseProtocolDecoder {
     protected Object decode(
             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
-        ChannelBuffer buf = (ChannelBuffer) msg;
-        int type = buf.readUnsignedShort();
-        buf.readUnsignedShort(); // length
+        ByteBuf buf = (ByteBuf) msg;
+        int type = buf.readUnsignedShortLE();
+        buf.readUnsignedShortLE(); // length
 
         if (type == MSG_IDENT || type == MSG_IDENT_FULL) {
 
-            buf.readUnsignedInt(); // id
-            int length = buf.readUnsignedShort();
+            buf.readUnsignedIntLE(); // id
+            int length = buf.readUnsignedShortLE();
             buf.skipBytes(length);
-            length = buf.readUnsignedShort();
+            length = buf.readUnsignedShortLE();
             buf.skipBytes(length);
-            length = buf.readUnsignedShort();
+            length = buf.readUnsignedShortLE();
             String imei = buf.readBytes(length).toString(StandardCharsets.US_ASCII);
             getDeviceSession(channel, remoteAddress, imei);
 
@@ -92,7 +93,7 @@ public class ProgressProtocolDecoder extends BaseProtocolDecoder {
 
             int recordCount = 1;
             if (type == MSG_LOGMSG) {
-                recordCount = buf.readUnsignedShort();
+                recordCount = buf.readUnsignedShortLE();
             }
 
             for (int j = 0; j < recordCount; j++) {
@@ -101,61 +102,60 @@ public class ProgressProtocolDecoder extends BaseProtocolDecoder {
 
                 if (type == MSG_LOGMSG) {
                     position.set(Position.KEY_ARCHIVE, true);
-                    int subtype = buf.readUnsignedShort();
+                    int subtype = buf.readUnsignedShortLE();
                     if (subtype == MSG_ALARM) {
                         position.set(Position.KEY_ALARM, Position.ALARM_GENERAL);
                     }
-                    if (buf.readUnsignedShort() > buf.readableBytes()) {
+                    if (buf.readUnsignedShortLE() > buf.readableBytes()) {
                         lastIndex += 1;
                         break; // workaround for device bug
                     }
-                    lastIndex = buf.readUnsignedInt();
+                    lastIndex = buf.readUnsignedIntLE();
                     position.set(Position.KEY_INDEX, lastIndex);
                 } else {
-                    newIndex = buf.readUnsignedInt();
+                    newIndex = buf.readUnsignedIntLE();
                 }
 
-                position.setTime(new Date(buf.readUnsignedInt() * 1000));
-                position.setLatitude(buf.readInt() * 180.0 / 0x7FFFFFFF);
-                position.setLongitude(buf.readInt() * 180.0 / 0x7FFFFFFF);
-                position.setSpeed(buf.readUnsignedInt() * 0.01);
-                position.setCourse(buf.readUnsignedShort() * 0.01);
-                position.setAltitude(buf.readUnsignedShort() * 0.01);
+                position.setTime(new Date(buf.readUnsignedIntLE() * 1000));
+                position.setLatitude(buf.readIntLE() * 180.0 / 0x7FFFFFFF);
+                position.setLongitude(buf.readIntLE() * 180.0 / 0x7FFFFFFF);
+                position.setSpeed(buf.readUnsignedIntLE() * 0.01);
+                position.setCourse(buf.readUnsignedShortLE() * 0.01);
+                position.setAltitude(buf.readUnsignedShortLE() * 0.01);
 
                 int satellites = buf.readUnsignedByte();
                 position.setValid(satellites >= 3);
                 position.set(Position.KEY_SATELLITES, satellites);
 
                 position.set(Position.KEY_RSSI, buf.readUnsignedByte());
-                position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
+                position.set(Position.KEY_ODOMETER, buf.readUnsignedIntLE());
 
-                long extraFlags = buf.readLong();
+                long extraFlags = buf.readLongLE();
 
                 if (BitUtil.check(extraFlags, 0)) {
-                    int count = buf.readUnsignedShort();
+                    int count = buf.readUnsignedShortLE();
                     for (int i = 1; i <= count; i++) {
-                        position.set(Position.PREFIX_ADC + i, buf.readUnsignedShort());
+                        position.set(Position.PREFIX_ADC + i, buf.readUnsignedShortLE());
                     }
                 }
 
                 if (BitUtil.check(extraFlags, 1)) {
-                    int size = buf.readUnsignedShort();
+                    int size = buf.readUnsignedShortLE();
                     position.set("can", buf.toString(buf.readerIndex(), size, StandardCharsets.US_ASCII));
                     buf.skipBytes(size);
                 }
 
                 if (BitUtil.check(extraFlags, 2)) {
-                    position.set("passenger",
-                            ChannelBuffers.hexDump(buf.readBytes(buf.readUnsignedShort())));
+                    position.set("passenger", ByteBufUtil.hexDump(buf.readBytes(buf.readUnsignedShortLE())));
                 }
 
                 if (type == MSG_ALARM) {
                     position.set(Position.KEY_ALARM, true);
                     byte[] response = {(byte) 0xC9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-                    channel.write(ChannelBuffers.wrappedBuffer(response));
+                    channel.write(Unpooled.wrappedBuffer(response));
                 }
 
-                buf.readUnsignedInt(); // crc
+                buf.readUnsignedIntLE(); // crc
 
                 positions.add(position);
             }