Merge pull request #4 from traccar/master

upgrade to current master

1 files changed, 45 insertions, 0 deletions

diff --git a/src/org/traccar/protocol/EgtsFrameDecoder.java b/src/org/traccar/protocol/EgtsFrameDecoder.java
new file mode 100644
index 000000000..71ffc1811
--- /dev/null
+++ b/src/org/traccar/protocol/EgtsFrameDecoder.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 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.
+ * 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 EgtsFrameDecoder extends FrameDecoder {
+
+    @Override
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
+
+        if (buf.readableBytes() < 10) {
+            return null;
+        }
+
+        int headerLength = buf.getUnsignedByte(buf.readerIndex() + 3);
+        int frameLength = buf.getUnsignedShort(buf.readerIndex() + 5);
+
+        int length = headerLength + frameLength + (frameLength > 0 ? 2 : 0);
+
+        if (buf.readableBytes() >= length) {
+            return buf.readBytes(length);
+        }
+
+        return null;
+    }
+
+}