aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/WondexFrameDecoder.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-05-19 12:24:23 +0500
committerAbyss777 <abyss@fox5.ru>2016-05-19 12:24:23 +0500
commit0d755bebbcb801ad7f1dd5ca6f085aa82c64cb26 (patch)
tree10eb5f09fc5752a705d75821bbf627f33d87a03c /src/org/traccar/protocol/WondexFrameDecoder.java
parent252530b36e2b7e09bfe16d301d1106f86ebf178d (diff)
downloadtrackermap-server-0d755bebbcb801ad7f1dd5ca6f085aa82c64cb26.tar.gz
trackermap-server-0d755bebbcb801ad7f1dd5ca6f085aa82c64cb26.tar.bz2
trackermap-server-0d755bebbcb801ad7f1dd5ca6f085aa82c64cb26.zip
- Added device identification on ping packet for Wondex protocol
- Store result of command execution to "result" field of position - Fixed wrong class in WondexFrameDecoderTest
Diffstat (limited to 'src/org/traccar/protocol/WondexFrameDecoder.java')
-rw-r--r--src/org/traccar/protocol/WondexFrameDecoder.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/WondexFrameDecoder.java b/src/org/traccar/protocol/WondexFrameDecoder.java
index c217166e8..7502c3320 100644
--- a/src/org/traccar/protocol/WondexFrameDecoder.java
+++ b/src/org/traccar/protocol/WondexFrameDecoder.java
@@ -15,7 +15,9 @@
*/
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;
@@ -40,6 +42,9 @@ 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);
} else {