Functionality fixes

project-chip · Apr 28, 2021 · 2ed665e · 2ed665e
1 parent f40b3c2
commit 2ed665e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
@@ -99,14 +99,16 @@ CHIP_ERROR writeAdminsIntoFabricsListAttribute(void)
         uint16_t vendorId = pairing.GetVendorId();
 
         // Skip over uninitialized admins
-        if (nodeId != kUndefinedNodeId && fabricId != kUndefinedFabricId && vendorId != kUndefinedVendorId)
+        if (nodeId == kUndefinedNodeId || fabricId == kUndefinedFabricId || vendorId == kUndefinedVendorId)
         {
-            if (writeFabric(fabricId, nodeId, vendorId, fabricIndex) != EMBER_ZCL_STATUS_SUCCESS)
-            {
-                emberAfPrintln(EMBER_AF_PRINT_DEBUG, "OpCreds: Failed to write admin with fabricId %" PRIX64 " in fabrics list", fabricId);
-                err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
-                break;
-            }
+            emberAfPrintln(EMBER_AF_PRINT_DEBUG, "OpCreds: Skipping over unitialized admin with fabricId %" PRIX64 
+                            ", nodeId %" PRIX64 " vendorId %" PRIX16, fabricId, nodeId, vendorId);
+            continue;
+        } else if (writeFabric(fabricId, nodeId, vendorId, fabricIndex) != EMBER_ZCL_STATUS_SUCCESS)
+        {
+            emberAfPrintln(EMBER_AF_PRINT_DEBUG, "OpCreds: Failed to write admin with fabricId %" PRIX64 " in fabrics list", fabricId);
+            err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
+            break;
         }
         fabricIndex ++;
     }
@@ -202,6 +204,7 @@ bool emberAfOperationalCredentialsClusterRemoveFabricCallback(chip::app::Command
     GetGlobalAdminPairingTable().ReleaseAdminId(adminId);
 
 exit:
+    writeAdminsIntoFabricsListAttribute();
     emberAfSendImmediateDefaultResponse(status);
     return true;
 }

diff --git a/src/messaging/ExchangeMgr.cpp b/src/messaging/ExchangeMgr.cpp
@@ -224,6 +224,8 @@ void ExchangeManager::OnMessageReceived(const PacketHeader & packetHeader, const
     UnsolicitedMessageHandler * matchingUMH = nullptr;
     bool sendAckAndCloseExchange            = false;
 
+    ChipLogProgress(ExchangeManager, "Received message of type %d and protocolId %d", payloadHeader.GetMessageType(), payloadHeader.GetProtocolID());
+
     // Search for an existing exchange that the message applies to. If a match is found...
     for (auto & ec : mContextPool)
     {