Fix some of the minor TODOs.

src/controller/python/chip/bdx/bdx-transfer-manager.cpp

@@ -44,8 +44,7 @@ BdxTransfer * BdxTransferManager::Allocate()
 
     BdxTransfer * result = mTransferPool.CreateObject();
     VerifyOrReturn(result != nullptr);
-    // TODO: This needs to intercept the delegate calls so it can free the transfer after it completes.
-    result->SetDelegate(mBdxTransferDelegate);
+    result->SetDelegate(this);
 
     --mExpectedTransfers;
     return result;
@@ -58,5 +57,21 @@ void BdxTransferManager::Release(BdxTransfer * bdxTransfer)
     mTransferPool.ReleaseObject(bdxTransfer);
 }
 
+void BdxTransferManager::InitMessageReceived(BdxTransfer * transfer, TransferSession::TransferInitData init_data)
+{
+    mBdxTransferDelegate->InitMessageReceived(transfer, init_data);
+}
+
+void BdxTransferManager::DataReceived(BdxTransfer * transfer, const ByteSpan & block)
+{
+    mBdxTransferDelegate->DataReceived(transfer, block);
+}
+
+void BdxTransferManager::TransferCompleted(BdxTransfer * transfer, CHIP_ERROR result)
+{
+    mBdxTransferDelegate->TransferCompleted(transfer, result);
+    mTransferPool.ReleaseObject(transfer);
+}
+
 } // namespace bdx
 } // namespace chip

src/controller/python/chip/bdx/bdx-transfer-manager.h

@@ -28,7 +28,7 @@ namespace bdx {
 
 // This class implements the pool interface used to allocate BdxTransfer objects. It keeps track of the number of transfers
 // that are expected to be created and only allocates a BdxTransfer object if a transfer is expected.
-class BdxTransferManager : public BdxTransferPool
+class BdxTransferManager : public BdxTransferPool, public BdxTransfer::Delegate
 {
 public:
     BdxTransferManager(BdxTransfer::Delegate * bdxTransferDelegate);
@@ -41,6 +41,10 @@ class BdxTransferManager : public BdxTransferPool
     BdxTransfer * Allocate() override;
     void Release(BdxTransfer * bdxTransfer) override;
 
+    void InitMessageReceived(BdxTransfer * transfer, TransferSession::TransferInitData init_data) override;
+    void DataReceived(BdxTransfer * transfer, const ByteSpan & block) override;
+    void TransferCompleted(BdxTransfer * transfer, CHIP_ERROR result) override;
+
 private:
     ObjectPool<BdxTransfer, 2> mTransferPool;
     BdxTransfer::Delegate * mBdxTransferDelegate = nullptr;

src/controller/python/chip/bdx/bdx-transfer.cpp

@@ -41,14 +41,15 @@ CHIP_ERROR BdxTransfer::AcceptSend()
     VerifyOrReturnError(mAwaitingAccept, CHIP_ERROR_INCORRECT_STATE);
     mAwaitingAccept = false;
 
-    TransferSession::TransferAcceptData accept_data;
-    accept_data.ControlMode = mInitData.TransferCtlFlags;  // TODO: Is this value correct?
-    accept_data.MaxBlockSize = mInitData.MaxBlockSize;
-    // TODO: Check the acceptable control modes for a Diagnostic Logs cluster transfer.
-    return mTransfer.AcceptTransfer(accept_data);
+    TransferSession::TransferAcceptData acceptData;
+    acceptData.ControlMode = TransferControlFlags::kSenderDrive;
+    acceptData.MaxBlockSize = mTransfer.GetTransferBlockSize();
+    acceptData.StartOffset = mTransfer.GetStartOffset();
+    acceptData.Length = mTransfer.GetTransferLength();
+    return mTransfer.AcceptTransfer(acceptData);
 }
 
-CHIP_ERROR BdxTransfer::AcceptReceive(const ByteSpan data_to_send)
+CHIP_ERROR BdxTransfer::AcceptReceive(const ByteSpan & data_to_send)
 {
     VerifyOrReturnError(mAwaitingAccept, CHIP_ERROR_INCORRECT_STATE);
     mAwaitingAccept = false;
@@ -60,10 +61,12 @@ CHIP_ERROR BdxTransfer::AcceptReceive(const ByteSpan data_to_send)
     memcpy(mData, data_to_send.data(), data_to_send.size());
     mDataCount = data_to_send.size();
 
-    TransferSession::TransferAcceptData accept_data;
-    accept_data.ControlMode = mInitData.TransferCtlFlags;  // TODO: Is this value correct?
-    accept_data.MaxBlockSize = mInitData.MaxBlockSize;
-    return mTransfer.AcceptTransfer(accept_data);
+    TransferSession::TransferAcceptData acceptData;
+    acceptData.ControlMode = TransferControlFlags::kReceiverDrive;
+    acceptData.MaxBlockSize = mTransfer.GetTransferBlockSize();
+    acceptData.StartOffset = mTransfer.GetStartOffset();
+    acceptData.Length = mTransfer.GetTransferLength();
+    return mTransfer.AcceptTransfer(acceptData);
 }
 
 CHIP_ERROR BdxTransfer::Reject()
@@ -82,13 +85,10 @@ void BdxTransfer::HandleTransferSessionOutput(TransferSession::OutputEvent & eve
     switch (event.EventType)
     {
     case TransferSession::OutputEventType::kInitReceived:
-        mInitData = event.transferInitData;
-        mDelegate->InitMessageReceived(this, mInitData);
+        mDelegate->InitMessageReceived(this, event.transferInitData);
         break;
     case TransferSession::OutputEventType::kStatusReceived:
         ChipLogError(BDX, "Received StatusReport %x", static_cast<uint16_t>(event.statusData.statusCode));
-        // TODO: Not a great error type. The issue isn't internal, it's external. We can check the status code, but I don't know
-        // if that would produce a better error type. Maybe CHIP_ERROR_IM_STATUS_CODE_RECEIVED?
         EndSession(CHIP_ERROR_INTERNAL);
         break;
     case TransferSession::OutputEventType::kInternalError:
@@ -116,8 +116,7 @@ void BdxTransfer::HandleTransferSessionOutput(TransferSession::OutputEvent & eve
         EndSession(CHIP_NO_ERROR);
         break;
     case TransferSession::OutputEventType::kQueryWithSkipReceived:
-        mDataTransferredCount += event.bytesToSkip.BytesToSkip;
-        mDataTransferredCount = std::min(mDataTransferredCount, mDataCount);
+        mDataTransferredCount = std::min<size_t>(mDataTransferredCount + event.bytesToSkip.BytesToSkip, mDataCount);
         // Fallthrough intentional.
     case TransferSession::OutputEventType::kQueryReceived:
         SendBlock();

src/controller/python/chip/bdx/bdx-transfer.h

@@ -15,7 +15,6 @@
  *    limitations under the License.
  */
 
-// TODO: Includes.
 #include <lib/support/Span.h>
 #include <messaging/ExchangeContext.h>
 
@@ -52,8 +51,7 @@ class BdxTransfer : public Responder
 
     // Accepts the transfer. The data provided here will be sent over the transfer. This must only be called if the transfer
     // receives data from this controller.
-    // TODO: Should the parameter be const&?
-    CHIP_ERROR AcceptReceive(const ByteSpan data_to_send);
+    CHIP_ERROR AcceptReceive(const ByteSpan & data_to_send);
 
     // Rejects the transfer.
     CHIP_ERROR Reject();
@@ -70,7 +68,6 @@ class BdxTransfer : public Responder
 
     Delegate * mDelegate = nullptr;
     bool mAwaitingAccept = false;
-    TransferSession::TransferInitData mInitData;
 
     // TODO: Request the data from a data source rather than copy the data here.
     uint8_t * mData = nullptr;