aboutsummaryrefslogtreecommitdiff
path: root/src/org
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
parent1bc13e97012570e617856ee15e399ec6b24b86d2 (diff)
downloadtraccar-server-79870a511a1f733e8980b720d3f560018f2dac12.tar.gz
traccar-server-79870a511a1f733e8980b720d3f560018f2dac12.tar.bz2
traccar-server-79870a511a1f733e8980b720d3f560018f2dac12.zip
- Removed any decoding from FrameDecoder
- Decoded ping packet in ProtocolDecoder - Adapted tests
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/WondexFrameDecoder.java6
-rw-r--r--src/org/traccar/protocol/WondexProtocol.java3
-rw-r--r--src/org/traccar/protocol/WondexProtocolDecoder.java17
3 files changed, 12 insertions, 14 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 {
diff --git a/src/org/traccar/protocol/WondexProtocol.java b/src/org/traccar/protocol/WondexProtocol.java
index 639669767..e7144eabe 100644
--- a/src/org/traccar/protocol/WondexProtocol.java
+++ b/src/org/traccar/protocol/WondexProtocol.java
@@ -18,7 +18,6 @@ package org.traccar.protocol;
import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.handler.codec.string.StringDecoder;
import org.jboss.netty.handler.codec.string.StringEncoder;
import org.traccar.BaseProtocol;
import org.traccar.TrackerServer;
@@ -42,7 +41,6 @@ public class WondexProtocol extends BaseProtocol {
protected void addSpecificHandlers(ChannelPipeline pipeline) {
pipeline.addLast("frameDecoder", new WondexFrameDecoder());
pipeline.addLast("stringEncoder", new StringEncoder());
- pipeline.addLast("stringDecoder", new StringDecoder());
pipeline.addLast("objectEncoder", new WondexProtocolEncoder());
pipeline.addLast("objectDecoder", new WondexProtocolDecoder(WondexProtocol.this));
}
@@ -51,7 +49,6 @@ public class WondexProtocol extends BaseProtocol {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
pipeline.addLast("stringEncoder", new StringEncoder());
- pipeline.addLast("stringDecoder", new StringDecoder());
pipeline.addLast("objectEncoder", new WondexProtocolEncoder());
pipeline.addLast("objectDecoder", new WondexProtocolDecoder(WondexProtocol.this));
}
diff --git a/src/org/traccar/protocol/WondexProtocolDecoder.java b/src/org/traccar/protocol/WondexProtocolDecoder.java
index d5c325037..837f40a08 100644
--- a/src/org/traccar/protocol/WondexProtocolDecoder.java
+++ b/src/org/traccar/protocol/WondexProtocolDecoder.java
@@ -15,6 +15,7 @@
*/
package org.traccar.protocol;
+import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
import org.traccar.helper.DateBuilder;
@@ -25,6 +26,7 @@ import org.traccar.model.Event;
import org.traccar.model.Position;
import java.net.SocketAddress;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.regex.Pattern;
@@ -59,23 +61,26 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder {
protected Object decode(
Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
- if (((String) msg).startsWith("$ID:")) {
- identify(((String) msg).substring(4), channel, remoteAddress);
+ if (((ChannelBuffer) msg).getUnsignedByte(0) == 0xD0) {
+
+ long deviceId = ((Long.reverseBytes((((ChannelBuffer) msg).getLong(0)))) >> 32) & 0xFFFFFFFFL;
+ identify(String.valueOf(deviceId), channel, remoteAddress);
+
return null;
- } else if (((String) msg).startsWith("$OK:") || ((String) msg).startsWith("$ERR:")) {
+ } else if (((ChannelBuffer) msg).toString(StandardCharsets.US_ASCII).startsWith("$OK:")
+ || ((ChannelBuffer) msg).toString(StandardCharsets.US_ASCII).startsWith("$ERR:")) {
Position position = new Position();
position.setProtocol(getProtocolName());
position.setDeviceId(getDeviceId());
getLastLocation(position, new Date());
position.setValid(false);
- position.set(Event.KEY_RESULT, (String) msg);
+ position.set(Event.KEY_RESULT, ((ChannelBuffer) msg).toString(StandardCharsets.US_ASCII));
return position;
-
} else {
- Parser parser = new Parser(PATTERN, (String) msg);
+ Parser parser = new Parser(PATTERN, ((ChannelBuffer) msg).toString(StandardCharsets.US_ASCII));
if (!parser.matches()) {
return null;
}