aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/At2000FrameDecoder.java21
-rw-r--r--src/org/traccar/protocol/At2000ProtocolDecoder.java15
2 files changed, 21 insertions, 15 deletions
diff --git a/src/org/traccar/protocol/At2000FrameDecoder.java b/src/org/traccar/protocol/At2000FrameDecoder.java
index d0be3f5f4..4c849afb7 100644
--- a/src/org/traccar/protocol/At2000FrameDecoder.java
+++ b/src/org/traccar/protocol/At2000FrameDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 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.
@@ -16,16 +16,31 @@
package org.traccar.protocol;
import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.handler.codec.frame.FrameDecoder;
+import java.nio.ByteOrder;
+
public class At2000FrameDecoder extends FrameDecoder {
private static final int BLOCK_LENGTH = 16;
+ private static final int ACK_LENGTH = 496;
private boolean firstPacket = true;
+ private void sendResponse(Channel channel) {
+ if (channel != null) {
+ ChannelBuffer response = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, 2 * BLOCK_LENGTH);
+ response.writeByte(At2000ProtocolDecoder.MSG_ACKNOWLEDGEMENT);
+ response.writeMedium(ChannelBuffers.swapMedium(1));
+ response.writeByte(0x00); // success
+ response.writerIndex(2 * BLOCK_LENGTH);
+ channel.write(response);
+ }
+ }
+
@Override
protected Object decode(
ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
@@ -47,6 +62,10 @@ public class At2000FrameDecoder extends FrameDecoder {
length = (length / BLOCK_LENGTH + 1) * BLOCK_LENGTH;
}
+ if (buf.readableBytes() >= length || buf.readableBytes() % ACK_LENGTH == 0) {
+ sendResponse(channel);
+ }
+
if (buf.readableBytes() >= length) {
return buf.readBytes(length);
}
diff --git a/src/org/traccar/protocol/At2000ProtocolDecoder.java b/src/org/traccar/protocol/At2000ProtocolDecoder.java
index 989e0d136..58b6f44e8 100644
--- a/src/org/traccar/protocol/At2000ProtocolDecoder.java
+++ b/src/org/traccar/protocol/At2000ProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 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.
@@ -48,17 +48,6 @@ public class At2000ProtocolDecoder extends BaseProtocolDecoder {
private Cipher cipher;
- private static void sendResponse(Channel channel) {
- if (channel != null) {
- ChannelBuffer response = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, 2 * BLOCK_LENGTH);
- response.writeByte(MSG_ACKNOWLEDGEMENT);
- response.writeMedium(ChannelBuffers.swapMedium(1));
- response.writeByte(0x00); // success
- response.writerIndex(2 * BLOCK_LENGTH);
- channel.write(response);
- }
- }
-
private static void sendRequest(Channel channel) {
if (channel != null) {
ChannelBuffer response = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, BLOCK_LENGTH);
@@ -136,8 +125,6 @@ public class At2000ProtocolDecoder extends BaseProtocolDecoder {
}
- sendResponse(channel);
-
if (type == MSG_DEVICE_ID) {
sendRequest(channel);
}