Add purge all fabric API

project-chip · Jun 9, 2022 · 64e6149 · 64e6149
1 parent bc4a550
commit 64e6149
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/src/messaging/ExchangeMgr.cpp b/src/messaging/ExchangeMgr.cpp
@@ -342,6 +342,20 @@ void ExchangeManager::CloseAllContextsForDelegate(const ExchangeDelegate * deleg
     });
 }
 
+void ExchangeManager::AbortExchangeForFabricExceptOne(FabricIndex fabricIndex, ExchangeContext * exception)
+{
+    mContextPool.ForEachActiveObject([&](auto * ec) {
+        if (ec->HasSessionHandle() && ec->GetSessionHandle()->GetPeer().GetFabricIndex() == fabricIndex)
+        {
+            if (ec == exception)
+                ec->SetAutoReleaseSession();
+            else
+                ec->Abort();
+        }
+        return Loop::Continue;
+    });
+}
+
 void ExchangeManager::AbortExchangeForNodeExceptOne(const ScopedNodeId & node, ExchangeContext * exception)
 {
     mContextPool.ForEachActiveObject([&](auto * ec) {

diff --git a/src/messaging/ExchangeMgr.h b/src/messaging/ExchangeMgr.h
@@ -183,8 +183,9 @@ class DLL_EXPORT ExchangeManager : public SessionMessageDelegate
      */
     void CloseAllContextsForDelegate(const ExchangeDelegate * delegate);
 
-    // This API is used by UpdateNOC command, to invalid all exchanges except the given one.
-    void AbortExchangeForNodeExceptOne(const ScopedNodeId & node, ExchangeContext * stay);
+    // This 2 APIs are used by UpdateNOC command, to invalid all exchanges except the given one.
+    void AbortExchangeForFabricExceptOne(FabricIndex fabricIndex, ExchangeContext * exception);
+    void AbortExchangeForNodeExceptOne(const ScopedNodeId & node, ExchangeContext * exception);
 
     SessionManager * GetSessionManager() const { return mSessionManager; }
 

diff --git a/src/transport/SessionManager.cpp b/src/transport/SessionManager.cpp
@@ -387,6 +387,20 @@ void SessionManager::ExpireAllPASEPairings()
     });
 }
 
+void SessionManager::ReleaseSessionForFabricExceptOne(FabricIndex fabricIndex, const SessionHandle & exception)
+{
+    mSecureSessions.ForEachSession([&](auto session) {
+        if (session->GetPeer().GetFabricIndex() == fabricIndex)
+        {
+            if (session == exception->AsSecureSession())
+                session->MarkForInactive();
+            else
+                session->MarkForRemoval();
+        }
+        return Loop::Continue;
+    });
+}
+
 void SessionManager::ReleaseSessionForNodeExceptOne(const ScopedNodeId & node, const SessionHandle & exception)
 {
     mSecureSessions.ForEachSession([&](auto session) {

diff --git a/src/transport/SessionManager.h b/src/transport/SessionManager.h
@@ -172,7 +172,8 @@ class DLL_EXPORT SessionManager : public TransportMgrDelegate
     void ExpireAllPASEPairings();
 
     // This API is used by UpdateNOC command, to invalid all sessions except the given one.
-    void ReleaseSessionForNodeExceptOne(const ScopedNodeId & node, const SessionHandle & stay);
+    void ReleaseSessionForFabricExceptOne(FabricIndex fabricIndex, const SessionHandle & exception);
+    void ReleaseSessionForNodeExceptOne(const ScopedNodeId & node, const SessionHandle & exception);
 
     /**
      * @brief