aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/GalileoFrameDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-06-07 15:53:12 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2018-06-07 15:53:12 +1200
commita9be10be1cf3709a6f6eb5d612c2f5485f12749e (patch)
tree8ec498f994dc16855093f8ef575ceeb12cb400a3 /src/org/traccar/protocol/GalileoFrameDecoder.java
parent6520327938582d5e4928d78fc70f95c60e9ac909 (diff)
downloadtrackermap-server-a9be10be1cf3709a6f6eb5d612c2f5485f12749e.tar.gz
trackermap-server-a9be10be1cf3709a6f6eb5d612c2f5485f12749e.tar.bz2
trackermap-server-a9be10be1cf3709a6f6eb5d612c2f5485f12749e.zip
Migrate G protocols
Diffstat (limited to 'src/org/traccar/protocol/GalileoFrameDecoder.java')
-rw-r--r--src/org/traccar/protocol/GalileoFrameDecoder.java20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/org/traccar/protocol/GalileoFrameDecoder.java b/src/org/traccar/protocol/GalileoFrameDecoder.java
index 6d02ce744..5a57c3a95 100644
--- a/src/org/traccar/protocol/GalileoFrameDecoder.java
+++ b/src/org/traccar/protocol/GalileoFrameDecoder.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,28 +15,24 @@
*/
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 GalileoFrameDecoder extends FrameDecoder {
+public class GalileoFrameDecoder extends BaseFrameDecoder {
private static final int MESSAGE_MINIMUM_LENGTH = 5;
@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_MINIMUM_LENGTH) {
return null;
}
- // Read packet
- int length = buf.getUnsignedShort(buf.readerIndex() + 1) & 0x7fff;
+ int length = buf.getUnsignedShortLE(buf.readerIndex() + 1) & 0x7fff;
if (buf.readableBytes() >= (length + MESSAGE_MINIMUM_LENGTH)) {
return buf.readBytes(length + MESSAGE_MINIMUM_LENGTH);
}