Add slave length to command match function to only process expected s…

…lave answers
csowada · Jan 3, 2020 · 380572e · 380572e
1 parent c14419e
commit 380572e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandRegistry.java b/src/main/java/de/csdev/ebus/command/EBusCommandRegistry.java
@@ -23,6 +23,7 @@
 
 import de.csdev.ebus.cfg.EBusConfigurationReaderException;
 import de.csdev.ebus.cfg.IEBusConfigurationReader;
+import de.csdev.ebus.command.IEBusCommandMethod.Type;
 import de.csdev.ebus.command.datatypes.EBusTypeException;
 import de.csdev.ebus.command.datatypes.EBusTypeRegistry;
 
@@ -253,6 +254,20 @@ public boolean matchesCommand(IEBusCommandMethod command, ByteBuffer data) {
                     }
                 }
                 if (i == mask.limit() - 1) {
+
+                    // add additional check for master-slave telegrams
+                    if (command.getType() == Type.MASTER_SLAVE) {
+
+                        int computedSlaveLen = EBusCommandUtils.getSlaveDataLength(command);
+                        int slaveLenPos = masterTelegram.limit() + 1;
+                        int slaveLen = data.get(slaveLenPos);
+
+                        if (slaveLen != computedSlaveLen) {
+                            return false;
+                        }
+
+                    }
+
                     return true;
                 }
             }

diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandUtils.java b/src/main/java/de/csdev/ebus/command/EBusCommandUtils.java
@@ -503,4 +503,20 @@ public static ByteBuffer getMasterTelegramMask(IEBusCommandMethod commandChannel
         return buf;
     }
 
+    /**
+     *
+     * @param command
+     * @return
+     */
+    public static int getSlaveDataLength(IEBusCommandMethod command) {
+        if (command.getType() == Type.MASTER_SLAVE) {
+            int len = 0;
+            for (IEBusValue value : command.getSlaveTypes()) {
+                len += value.getType().getTypeLength();
+            }
+            return len;
+        }
+
+        return -1;
+    }
 }