Abort BDX transfers as needed on controller shutdown.

src/controller/CHIPDeviceController.cpp

@@ -403,6 +403,9 @@ void DeviceController::Shutdown()
         // assume that all sessions for our fabric belong to us here.
         mSystemState->CASESessionMgr()->ReleaseSessionsForFabric(mFabricIndex);
 
+        // Shut down any bdx transfers we're acting as the server for.
+        mSystemState->BDXTransferServer()->AbortTransfersForFabric(mFabricIndex);
+
         // TODO: The CASE session manager does not shut down existing CASE
         // sessions.  It just shuts down any ongoing CASE session establishment
         // we're in the middle of as initiator.  Maybe it should shut down

src/protocols/bdx/BdxTransferDiagnosticLog.cpp

@@ -18,6 +18,8 @@
 
 #include "BdxTransferDiagnosticLog.h"
 
+#include <protocols/bdx/BdxTransferDiagnosticLogPool.h>
+
 namespace chip {
 namespace bdx {
 
@@ -201,5 +203,23 @@ void BdxTransferDiagnosticLog::OnExchangeClosing(Messaging::ExchangeContext * ec
     LogErrorOnFailure(OnTransferSessionEnd(CHIP_ERROR_INTERNAL));
 }
 
+bool BdxTransferDiagnosticLog::IsForFabric(FabricIndex fabricIndex) const
+{
+    if (mExchangeCtx == nullptr || !mExchangeCtx->HasSessionHandle())
+    {
+        return false;
+    }
+
+    auto session = mExchangeCtx->GetSessionHandle();
+    return session->GetFabricIndex() == fabricIndex;
+}
+
+void BdxTransferDiagnosticLog::AbortTransfer()
+{
+    // No need to mTransfer.AbortTransfer() here, since that just tries to async
+    // send a StatusReport to the other side, but we are going away here.
+    Reset();
+}
+
 } // namespace bdx
 } // namespace chip

src/protocols/bdx/BdxTransferDiagnosticLog.h

@@ -18,14 +18,17 @@
 
 #pragma once
 
-#include <protocols/bdx/BdxTransferDiagnosticLogPool.h>
+#include <lib/core/DataModelTypes.h>
 #include <protocols/bdx/BdxTransferProxyDiagnosticLog.h>
+#include <protocols/bdx/BdxTransferServerDelegate.h>
 #include <protocols/bdx/TransferFacilitator.h>
 #include <system/SystemLayer.h>
 
 namespace chip {
 namespace bdx {
 
+class BdxTransferDiagnosticLogPoolDelegate;
+
 class BdxTransferDiagnosticLog : public Responder
 {
 public:
@@ -45,6 +48,13 @@ class BdxTransferDiagnosticLog : public Responder
 
     void OnExchangeClosing(Messaging::ExchangeContext * ec) override;
 
+    /**
+     * Lifetime management, to allow us to abort transfers when a fabric
+     * identity is being shut down.
+     */
+    bool IsForFabric(FabricIndex fabricIndex) const;
+    void AbortTransfer();
+
 protected:
     /**
      * Called when a BDX message is received over the exchange context

src/protocols/bdx/BdxTransferDiagnosticLogPool.h

@@ -18,15 +18,15 @@
 
 #pragma once
 
+#include <lib/core/DataModelTypes.h>
 #include <lib/support/Pool.h>
+#include <protocols/bdx/BdxTransferDiagnosticLog.h>
 #include <protocols/bdx/BdxTransferServerDelegate.h>
 #include <system/SystemLayer.h>
 
 namespace chip {
 namespace bdx {
 
-class BdxTransferDiagnosticLog;
-
 class BdxTransferDiagnosticLogPoolDelegate
 {
 public:
@@ -50,6 +50,17 @@ class BdxTransferDiagnosticLogPool : public BdxTransferDiagnosticLogPoolDelegate
 
     void Release(BdxTransferDiagnosticLog * transfer) override { mTransferPool.ReleaseObject(transfer); }
 
+    void AbortTransfersForFabric(FabricIndex fabricIndex)
+    {
+        mTransferPool.ForEachActiveObject([fabricIndex](BdxTransferDiagnosticLog * transfer) {
+            if (transfer->IsForFabric(fabricIndex))
+            {
+                transfer->AbortTransfer();
+            }
+            return Loop::Continue;
+        });
+    }
+
 private:
     ObjectPool<BdxTransferDiagnosticLog, N> mTransferPool;
 };

src/protocols/bdx/BdxTransferServer.h

@@ -20,6 +20,7 @@
 
 #include <protocols/bdx/BdxTransferDiagnosticLogPool.h>
 
+#include <lib/core/DataModelTypes.h>
 #include <messaging/ExchangeDelegate.h>
 #include <messaging/ExchangeMgr.h>
 #include <protocols/bdx/BdxTransferDiagnosticLog.h>
@@ -42,6 +43,8 @@ class BDXTransferServer : public Messaging::UnsolicitedMessageHandler
 
     void SetDelegate(BDXTransferServerDelegate * delegate) { mDelegate = delegate; }
 
+    void AbortTransfersForFabric(FabricIndex fabricIndex) { mPoolDelegate.AbortTransfersForFabric(fabricIndex); }
+
 protected:
     CHIP_ERROR OnUnsolicitedMessageReceived(const PayloadHeader & payloadHeader,
                                             Messaging::ExchangeDelegate *& newDelegate) override;