aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2021-11-04 22:11:52 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2021-11-04 22:11:52 -0700
commit81836343161dfe5eb4aef1972a1e368686685fd6 (patch)
tree7442e9cac64b0fc2bbacffe4a98d1d02aa7a7424
parentb563ec10b48742f34fe9f9738b0b4ce5967d0fe6 (diff)
downloadtrackermap-server-81836343161dfe5eb4aef1972a1e368686685fd6.tar.gz
trackermap-server-81836343161dfe5eb4aef1972a1e368686685fd6.tar.bz2
trackermap-server-81836343161dfe5eb4aef1972a1e368686685fd6.zip
Fix Teltonika DualCam issues
-rw-r--r--src/main/java/org/traccar/protocol/DualcamProtocol.java2
-rw-r--r--src/main/java/org/traccar/protocol/DualcamProtocolDecoder.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/DualcamProtocol.java b/src/main/java/org/traccar/protocol/DualcamProtocol.java
index 9f8d6778e..04c4f2bd1 100644
--- a/src/main/java/org/traccar/protocol/DualcamProtocol.java
+++ b/src/main/java/org/traccar/protocol/DualcamProtocol.java
@@ -25,8 +25,8 @@ public class DualcamProtocol extends BaseProtocol {
addServer(new TrackerServer(false, getName()) {
@Override
protected void addProtocolHandlers(PipelineBuilder pipeline) {
+ pipeline.addLast(new DualcamFrameDecoder());
pipeline.addLast(new DualcamProtocolDecoder(DualcamProtocol.this));
- pipeline.addLast(new DishaProtocolDecoder(DualcamProtocol.this));
}
});
}
diff --git a/src/main/java/org/traccar/protocol/DualcamProtocolDecoder.java b/src/main/java/org/traccar/protocol/DualcamProtocolDecoder.java
index 4647e287c..390b8e705 100644
--- a/src/main/java/org/traccar/protocol/DualcamProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/DualcamProtocolDecoder.java
@@ -110,6 +110,7 @@ public class DualcamProtocolDecoder extends BaseProtocolDecoder {
response.writeShort(MSG_INIT_REQUEST);
channel.writeAndFlush(new NetworkMessage(response, remoteAddress));
}
+ return position;
} else {
currentPacket += 1;
}