aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2019-08-23 23:23:43 -0700
committerGitHub <noreply@github.com>2019-08-23 23:23:43 -0700
commit4860e6ede4a174443bce1d5a809b5dfe1ae68543 (patch)
treead850364822fca09f353236256cb2ddf7f3d7966 /src/main
parent4ebb2d0c5c03846999b083c7ee52720730279b90 (diff)
parent841eea22d98c943272bd0b7c99d395a3d38308aa (diff)
downloadtraccar-server-4860e6ede4a174443bce1d5a809b5dfe1ae68543.tar.gz
traccar-server-4860e6ede4a174443bce1d5a809b5dfe1ae68543.tar.bz2
traccar-server-4860e6ede4a174443bce1d5a809b5dfe1ae68543.zip
Merge pull request #4388 from edvalley/proposed
Enhance Wialon protocol decoder
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/traccar/protocol/WialonProtocol.java19
-rw-r--r--src/main/java/org/traccar/protocol/WialonProtocolDecoder.java49
2 files changed, 51 insertions, 17 deletions
diff --git a/src/main/java/org/traccar/protocol/WialonProtocol.java b/src/main/java/org/traccar/protocol/WialonProtocol.java
index 3838791a7..fd183dd2c 100644
--- a/src/main/java/org/traccar/protocol/WialonProtocol.java
+++ b/src/main/java/org/traccar/protocol/WialonProtocol.java
@@ -38,11 +38,28 @@ public class WialonProtocol extends BaseProtocol {
@Override
protected void addProtocolHandlers(PipelineBuilder pipeline) {
pipeline.addLast(new LineBasedFrameDecoder(4 * 1024));
- pipeline.addLast(new StringEncoder());
boolean utf8 = Context.getConfig().getBoolean(getName() + ".utf8");
if (utf8) {
+ pipeline.addLast(new StringEncoder(StandardCharsets.UTF_8));
pipeline.addLast(new StringDecoder(StandardCharsets.UTF_8));
} else {
+ pipeline.addLast(new StringEncoder());
+ pipeline.addLast(new StringDecoder());
+ }
+ pipeline.addLast(new WialonProtocolEncoder(WialonProtocol.this));
+ pipeline.addLast(new WialonProtocolDecoder(WialonProtocol.this));
+ }
+ });
+ addServer(new TrackerServer(true, getName()) {
+ @Override
+ protected void addProtocolHandlers(PipelineBuilder pipeline) {
+ pipeline.addLast(new LineBasedFrameDecoder(4 * 1024));
+ boolean utf8 = Context.getConfig().getBoolean(getName() + ".utf8");
+ if (utf8) {
+ pipeline.addLast(new StringEncoder(StandardCharsets.UTF_8));
+ pipeline.addLast(new StringDecoder(StandardCharsets.UTF_8));
+ } else {
+ pipeline.addLast(new StringEncoder());
pipeline.addLast(new StringDecoder());
}
pipeline.addLast(new WialonProtocolEncoder(WialonProtocol.this));
diff --git a/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java b/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java
index 42ff3177e..8488ca2d1 100644
--- a/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java
@@ -38,6 +38,14 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder {
super(protocol);
}
+ private static final Pattern PATTERN_ANY = new PatternBuilder()
+ .expression("([^#]*)?") // imei
+ .text("#") // start byte
+ .expression("([^#]+)") // type
+ .text("#") // separator
+ .expression("(.*)") // message
+ .compile();
+
private static final Pattern PATTERN = new PatternBuilder()
.number("(dd)(dd)(dd);") // date (ddmmyy)
.number("(dd)(dd)(dd);") // time (hhmmss)
@@ -62,7 +70,8 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder {
private void sendResponse(Channel channel, SocketAddress remoteAddress, String type, Integer number) {
if (channel != null) {
StringBuilder response = new StringBuilder("#A");
- response.append(type.substring(1));
+ response.append(type);
+ response.append("#");
if (number != null) {
response.append(number);
}
@@ -71,9 +80,9 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder {
}
}
- private Position decodePosition(Channel channel, SocketAddress remoteAddress, String substring) {
+ private Position decodePosition(Channel channel, SocketAddress remoteAddress, String id, String substring) {
- DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
+ DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, id);
if (deviceSession == null) {
return null;
}
@@ -135,12 +144,20 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder {
Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
String sentence = (String) msg;
- String type = sentence.substring(0, sentence.indexOf('#', 1) + 1);
+
+ Parser parser = new Parser(PATTERN_ANY, sentence);
+ if (!parser.matches()) {
+ return null;
+ }
+
+ String id = parser.next();
+ String type = parser.next();
+ String data = parser.next();
switch (type) {
- case "#L#":
- String[] values = sentence.substring(3).split(";");
+ case "L":
+ String[] values = data.split(";");
String imei = values[0].indexOf('.') >= 0 ? values[1] : values[0];
DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, imei);
@@ -149,14 +166,14 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder {
}
break;
- case "#P#":
+ case "P":
sendResponse(channel, remoteAddress, type, null); // heartbeat
break;
- case "#D#":
- case "#SD#":
+ case "D":
+ case "SD":
Position position = decodePosition(
- channel, remoteAddress, sentence.substring(sentence.indexOf('#', 1) + 1));
+ channel, remoteAddress, id, data);
if (position != null) {
sendResponse(channel, remoteAddress, type, 1);
@@ -164,12 +181,12 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder {
}
break;
- case "#B#":
- String[] messages = sentence.substring(sentence.indexOf('#', 1) + 1).split("\\|");
+ case "B":
+ String[] messages = data.split("\\|");
List<Position> positions = new LinkedList<>();
for (String message : messages) {
- position = decodePosition(channel, remoteAddress, message);
+ position = decodePosition(channel, remoteAddress, id, message);
if (position != null) {
position.set(Position.KEY_ARCHIVE, true);
positions.add(position);
@@ -182,14 +199,14 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder {
}
break;
- case "#M#":
- deviceSession = getDeviceSession(channel, remoteAddress);
+ case "M":
+ deviceSession = getDeviceSession(channel, remoteAddress, id);
if (deviceSession != null) {
position = new Position(getProtocolName());
position.setDeviceId(deviceSession.getDeviceId());
getLastLocation(position, new Date());
position.setValid(false);
- position.set(Position.KEY_RESULT, sentence.substring(sentence.indexOf('#', 1) + 1));
+ position.set(Position.KEY_RESULT, data);
sendResponse(channel, remoteAddress, type, 1);
return position;
}