Merge branch 'master' into anravi4_fix

1 files changed, 24 insertions, 13 deletions

diff --git a/src/org/traccar/protocol/Arnavi4FrameDecoder.java b/src/org/traccar/protocol/Arnavi4FrameDecoder.java
index 97bf75a20..a50ece641 100644
--- a/src/org/traccar/protocol/Arnavi4FrameDecoder.java
+++ b/src/org/traccar/protocol/Arnavi4FrameDecoder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2017 Ivan Muratov (binakot@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;
@@ -5,11 +20,10 @@ import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.handler.codec.frame.FrameDecoder;
 
-/**
- * Created by Ivan Muratov @binakot on 12.07.2017.
- */
 public class Arnavi4FrameDecoder extends FrameDecoder {
 
+    static final int PACKET_MIN_LENGTH = 4;
+
     static final byte HEADER_START_SIGN = (byte) 0xFF;
     static final byte HEADER_VERSION_1 = 0x22;
     static final byte HEADER_VERSION_2 = 0x23;
@@ -26,23 +40,20 @@ public class Arnavi4FrameDecoder extends FrameDecoder {
             Channel channel,
             ChannelBuffer buf) throws Exception {
 
-        if (buf.readableBytes() == 0) {
+        if (buf.readableBytes() < PACKET_MIN_LENGTH) {
             return null;
         }
 
-        byte[] bytes = new byte[buf.readableBytes()];
-        buf.getBytes(0, bytes);
-
-        if (bytes[0] == HEADER_START_SIGN
-                && bytes.length == HEADER_LENGTH
-                && (bytes[1] == HEADER_VERSION_1 || bytes[1] == HEADER_VERSION_2)) {
+        if (buf.getByte(0) == HEADER_START_SIGN
+                && buf.readableBytes() == HEADER_LENGTH
+                && (buf.getByte(1) == HEADER_VERSION_1 || buf.getByte(1) == HEADER_VERSION_2)) {
             return buf.readBytes(HEADER_LENGTH);
         }
 
-        int parcelNumber = bytes[1] & 0xFF;
-        if (bytes[0] == PACKAGE_START_SIGN && bytes[bytes.length - 1] == PACKAGE_END_SIGN
+        int parcelNumber = buf.getByte(1) & 0xFF;
+        if (buf.getByte(0) == PACKAGE_START_SIGN && buf.getByte(buf.readableBytes() - 1) == PACKAGE_END_SIGN
                 && parcelNumber >= PACKAGE_MIN_PARCEL_NUMBER && parcelNumber <= PACKAGE_MAX_PARCEL_NUMBER) {
-            return buf.readBytes(bytes.length);
+            return buf;
         }
 
         return null;