From 4654dafc59c9c86b0204c4ef43dba3e560d77382 Mon Sep 17 00:00:00 2001
From: Wang Qixiang <43193572+wqx6@users.noreply.github.com>
Date: Sat, 26 Aug 2023 09:19:31 +0800
Subject: [PATCH] ICD: fix expect response count issue (#28887)

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
---
 src/messaging/ExchangeContext.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/messaging/ExchangeContext.cpp b/src/messaging/ExchangeContext.cpp
index cac98cd95017f0..bb8fe2d993da32 100644
--- a/src/messaging/ExchangeContext.cpp
+++ b/src/messaging/ExchangeContext.cpp
@@ -156,7 +156,7 @@ CHIP_ERROR ExchangeContext::SendMessage(Protocols::Id protocolId, uint8_t msgTyp
     bool reliableTransmissionRequested =
         GetSessionHandle()->RequireMRP() && !sendFlags.Has(SendMessageFlags::kNoAutoRequestAck) && !IsGroupExchangeContext();
 
-    bool startedResponseTimer = false;
+    bool currentMessageExpectResponse = false;
     // If a response message is expected...
     if (sendFlags.Has(SendMessageFlags::kExpectResponse) && !IsGroupExchangeContext())
     {
@@ -178,7 +178,7 @@ CHIP_ERROR ExchangeContext::SendMessage(Protocols::Id protocolId, uint8_t msgTyp
                 SetResponseExpected(false);
                 return err;
             }
-            startedResponseTimer = true;
+            currentMessageExpectResponse = true;
         }
     }
 
@@ -222,9 +222,9 @@ CHIP_ERROR ExchangeContext::SendMessage(Protocols::Id protocolId, uint8_t msgTyp
 #endif
         if (err != CHIP_NO_ERROR)
         {
-            // We should only cancel the response timer if the ExchangeContext fails to send the message that starts the response
-            // timer.
-            if (startedResponseTimer)
+            // We should only cancel the response timer if the ExchangeContext fails to send the message that expects a
+            // response.
+            if (currentMessageExpectResponse)
             {
                 CancelResponseTimer();
                 SetResponseExpected(false);
@@ -243,7 +243,7 @@ CHIP_ERROR ExchangeContext::SendMessage(Protocols::Id protocolId, uint8_t msgTyp
 #if CONFIG_DEVICE_LAYER && CHIP_CONFIG_ENABLE_ICD_SERVER
             DeviceLayer::ChipDeviceEvent event;
             event.Type                       = DeviceLayer::DeviceEventType::kChipMsgSentEvent;
-            event.MessageSent.ExpectResponse = IsResponseExpected();
+            event.MessageSent.ExpectResponse = currentMessageExpectResponse;
             CHIP_ERROR status                = DeviceLayer::PlatformMgr().PostEvent(&event);
             if (status != CHIP_NO_ERROR)
             {