Re-enable MRP for reads.

With project-chip#7958 merged, this should not be a problem. Prospectively re-enabling for WriteClient too, though that code is not used yet.
bzbarsky-apple · Jun 29, 2021 · 7381841 · 7381841
1 parent 10a7ac6
commit 7381841
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/app/ReadClient.cpp b/src/app/ReadClient.cpp
@@ -158,10 +158,8 @@ CHIP_ERROR ReadClient::SendReadRequest(NodeId aNodeId, Transport::AdminId aAdmin
     VerifyOrExit(mpExchangeCtx != nullptr, err = CHIP_ERROR_NO_MEMORY);
     mpExchangeCtx->SetResponseTimeout(kImMessageTimeoutMsec);
 
-    // TODO (#7909): Disable CRMP temporary for duplicate ACK issues, should be enabled later.
-    err = mpExchangeCtx->SendMessage(
-        Protocols::InteractionModel::MsgType::ReadRequest, std::move(msgBuf),
-        Messaging::SendFlags(Messaging::SendMessageFlags::kExpectResponse).Set(Messaging::SendMessageFlags::kNoAutoRequestAck));
+    err = mpExchangeCtx->SendMessage(Protocols::InteractionModel::MsgType::ReadRequest, std::move(msgBuf),
+                                     Messaging::SendFlags(Messaging::SendMessageFlags::kExpectResponse));
     SuccessOrExit(err);
     MoveToState(ClientState::AwaitingResponse);
 

diff --git a/src/app/WriteClient.cpp b/src/app/WriteClient.cpp
@@ -270,7 +270,7 @@ CHIP_ERROR WriteClient::SendWriteRequest(NodeId aNodeId, Transport::AdminId aAdm
 
     err = mpExchangeCtx->SendMessage(
         Protocols::InteractionModel::MsgType::WriteRequest, std::move(packet),
-        Messaging::SendFlags(Messaging::SendMessageFlags::kExpectResponse).Set(Messaging::SendMessageFlags::kNoAutoRequestAck));
+        Messaging::SendFlags(Messaging::SendMessageFlags::kExpectResponse));
     SuccessOrExit(err);
     MoveToState(State::AwaitingResponse);