Merge pull request #2407 from Abyss777/gl200

GL200 Password for commands and heartbeat authentication

1 files changed, 7 insertions, 2 deletions

diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/Gl200ProtocolDecoder.java
index 385039399..b55f4e606 100644
--- a/src/org/traccar/protocol/Gl200ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gl200ProtocolDecoder.java
@@ -39,7 +39,8 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder {
 
     private static final Pattern PATTERN_HBD = new PatternBuilder()
             .text("+ACK:GTHBD,")
-            .number("([0-9A-Z]{2}xxxx),")
+            .number("([0-9A-Z]{2}xxxx),")        // protocol version
+            .number("(d{15}),")                  // imei
             .any().text(",")
             .number("(xxxx)")
             .text("$").optional()
@@ -245,7 +246,11 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder {
     private Object decodeHbd(Channel channel, SocketAddress remoteAddress, String sentence) {
         Parser parser = new Parser(PATTERN_HBD, sentence);
         if (parser.matches() && channel != null) {
-            channel.write("+SACK:GTHBD," + parser.next() + "," + parser.next() + "$", remoteAddress);
+            String protocolVersion = parser.next();
+            DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
+            if (deviceSession != null) {
+                channel.write("+SACK:GTHBD," + protocolVersion + "," + parser.next() + "$", remoteAddress);
+            }
         }
         return null;
     }