From 1db5f2aac51279c65ff2b983923452c6f4bad4e9 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sun, 29 Oct 2023 20:29:46 -0700
Subject: Better DSM detection

---
 src/main/java/org/traccar/protocol/DualcamProtocolDecoder.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/traccar/protocol/DualcamProtocolDecoder.java b/src/main/java/org/traccar/protocol/DualcamProtocolDecoder.java
index 801e8d22e..75cd52384 100644
--- a/src/main/java/org/traccar/protocol/DualcamProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/DualcamProtocolDecoder.java
@@ -19,6 +19,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
+import org.traccar.model.Device;
 import org.traccar.session.DeviceSession;
 import org.traccar.NetworkMessage;
 import org.traccar.Protocol;
@@ -45,6 +46,7 @@ public class DualcamProtocolDecoder extends BaseProtocolDecoder {
     public static final int MSG_PATH_REQUEST = 0x000C;
     public static final int MSG_PATH_RESPONSE = 0x000D;
 
+    private String model;
     private String uniqueId;
     private int dataSize;
     private int dataCurrent;
@@ -52,7 +54,11 @@ public class DualcamProtocolDecoder extends BaseProtocolDecoder {
     private ByteBuf media;
 
     private boolean isPacketData() {
-        return dataSize < 1000;
+        if (model == null) {
+            return dataSize < 8192;
+        } else {
+            return !"DSM".equals(model);
+        }
     }
 
     @Override
@@ -71,6 +77,7 @@ public class DualcamProtocolDecoder extends BaseProtocolDecoder {
                 deviceSession = getDeviceSession(channel, remoteAddress, uniqueId);
                 long settings = buf.readUnsignedInt();
                 if (channel != null && deviceSession != null) {
+                    model = getCacheManager().getObject(Device.class, deviceSession.getDeviceId()).getModel();
                     ByteBuf response = Unpooled.buffer();
                     if (BitUtil.check(settings, 25)) {
                         response.writeShort(MSG_PATH_REQUEST);
-- 
cgit v1.2.3