aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2020-02-18 21:39:04 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2020-02-18 21:39:04 -0800
commit0f4695199a9a6c212bbe7021aa11db775eb2b7e5 (patch)
treeae86b51cbd5f33db0476aaa30806df5e68551d88 /src
parent4512941667653c15a28e0917024c04b73238005a (diff)
downloadtraccar-server-0f4695199a9a6c212bbe7021aa11db775eb2b7e5.tar.gz
traccar-server-0f4695199a9a6c212bbe7021aa11db775eb2b7e5.tar.bz2
traccar-server-0f4695199a9a6c212bbe7021aa11db775eb2b7e5.zip
Support UDP protocol
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/traccar/protocol/EskyProtocol.java10
-rw-r--r--src/main/java/org/traccar/protocol/EskyProtocolDecoder.java11
2 files changed, 18 insertions, 3 deletions
diff --git a/src/main/java/org/traccar/protocol/EskyProtocol.java b/src/main/java/org/traccar/protocol/EskyProtocol.java
index aaa92da58..fb047c207 100644
--- a/src/main/java/org/traccar/protocol/EskyProtocol.java
+++ b/src/main/java/org/traccar/protocol/EskyProtocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2020 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,6 +33,14 @@ public class EskyProtocol extends BaseProtocol {
pipeline.addLast(new EskyProtocolDecoder(EskyProtocol.this));
}
});
+ addServer(new TrackerServer(true, getName()) {
+ @Override
+ protected void addProtocolHandlers(PipelineBuilder pipeline) {
+ pipeline.addLast(new StringEncoder());
+ pipeline.addLast(new StringDecoder());
+ pipeline.addLast(new EskyProtocolDecoder(EskyProtocol.this));
+ }
+ });
}
}
diff --git a/src/main/java/org/traccar/protocol/EskyProtocolDecoder.java b/src/main/java/org/traccar/protocol/EskyProtocolDecoder.java
index 641b2e28f..d9de110f4 100644
--- a/src/main/java/org/traccar/protocol/EskyProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/EskyProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2020 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,8 +16,10 @@
package org.traccar.protocol;
import io.netty.channel.Channel;
+import io.netty.channel.socket.DatagramChannel;
import org.traccar.BaseProtocolDecoder;
import org.traccar.DeviceSession;
+import org.traccar.NetworkMessage;
import org.traccar.Protocol;
import org.traccar.helper.Parser;
import org.traccar.helper.PatternBuilder;
@@ -35,7 +37,7 @@ public class EskyProtocolDecoder extends BaseProtocolDecoder {
private static final Pattern PATTERN = new PatternBuilder()
.expression("..;") // header
- .number("d+;") // index
+ .number("(d+);") // index
.number("(d+);") // imei
.text("R;") // data type
.number("(d+)[+;]") // satellites
@@ -63,6 +65,11 @@ public class EskyProtocolDecoder extends BaseProtocolDecoder {
return null;
}
+ int index = parser.nextInt();
+ if (channel instanceof DatagramChannel) {
+ channel.writeAndFlush(new NetworkMessage("ACK," + index + "#", remoteAddress));
+ }
+
DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
if (deviceSession == null) {
return null;