aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/WondexFrameDecoder.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-05-22 14:33:43 +0500
committerAbyss777 <abyss@fox5.ru>2016-05-22 14:33:43 +0500
commit79870a511a1f733e8980b720d3f560018f2dac12 (patch)
tree5dbe0e9242efc974e7ba8510eb49ff71287dd6d1 /src/org/traccar/protocol/WondexFrameDecoder.java
parent1bc13e97012570e617856ee15e399ec6b24b86d2 (diff)
downloadtrackermap-server-79870a511a1f733e8980b720d3f560018f2dac12.tar.gz
trackermap-server-79870a511a1f733e8980b720d3f560018f2dac12.tar.bz2
trackermap-server-79870a511a1f733e8980b720d3f560018f2dac12.zip
- Removed any decoding from FrameDecoder
- Decoded ping packet in ProtocolDecoder - Adapted tests
Diffstat (limited to 'src/org/traccar/protocol/WondexFrameDecoder.java')
-rw-r--r--src/org/traccar/protocol/WondexFrameDecoder.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/WondexFrameDecoder.java b/src/org/traccar/protocol/WondexFrameDecoder.java
index c5309db71..ac1622350 100644
--- a/src/org/traccar/protocol/WondexFrameDecoder.java
+++ b/src/org/traccar/protocol/WondexFrameDecoder.java
@@ -15,9 +15,7 @@
*/
package org.traccar.protocol;
-import java.nio.charset.StandardCharsets;
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;
@@ -42,9 +40,7 @@ public class WondexFrameDecoder extends FrameDecoder {
if (channel != null) {
channel.write(frame);
}
- // Pass deviceId to protocol decoder
- long deviceId = ((Long.reverseBytes((frame.getLong(0)))) >> 32) & 0xFFFFFFFFL;
- return ChannelBuffers.copiedBuffer("$ID:" + String.valueOf(deviceId), StandardCharsets.US_ASCII);
+ return frame;
} else {