project-chip#26925 add error log if fabricIdx or nodeId is missing on…

… remote actions
mmarc · Jul 21, 2023 · 7b90c3f · 7b90c3f
1 parent 8577934
commit 7b90c3f
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -128,8 +128,21 @@ bool DoorLockServer::SetLockState(chip::EndpointId endpointId, DlLockState newLo
         opType = LockOperationTypeEnum::kUnlatch;
     }
 
-    SendLockOperationEvent(endpointId, opType, opSource, OperationErrorEnum::kUnspecified, userIndex, fabricIdx, nodeId,
-                           credentials, success);
+    if (OperationSourceEnum::kRemote == opSource)
+    {
+        if (fabricIdx.IsNull() || nodeId.IsNull())
+        {
+            ChipLogError(Zcl, "Received SetLockState for remote operation without fabricIdx or nodeId");
+        }
+
+        SendLockOperationEvent(endpointId, opType, opSource, OperationErrorEnum::kUnspecified, userIndex, fabricIdx, nodeId,
+                               credentials, success);
+    }
+    else
+    {
+        SendLockOperationEvent(endpointId, opType, opSource, OperationErrorEnum::kUnspecified, userIndex, NullNullable,
+                               NullNullable, credentials, success);
+    }
 
     // Reset wrong entry attempts (in case there were any incorrect credentials presented before) if lock/unlock was a success
     // and a valid credential was presented.