From 68c6f869182323696f77c886d3e36342d41631d3 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <vnicolas@apple.com>
Date: Fri, 21 Oct 2022 20:56:51 +0200
Subject: [PATCH] [MRP] Update GetAckTimeout to take into account the
 PeerActive status and use GetRestransmissionTimeout to be more accurate

---
 .../python/test/test_scripts/network_commissioning.py       | 2 +-
 src/transport/SecureSession.h                               | 6 ++++--
 src/transport/Session.h                                     | 2 --
 src/transport/UnauthenticatedSessionTable.h                 | 6 ++++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/controller/python/test/test_scripts/network_commissioning.py b/src/controller/python/test/test_scripts/network_commissioning.py
index 1b13928358c0a1..e46655df4e9d0b 100644
--- a/src/controller/python/test/test_scripts/network_commissioning.py
+++ b/src/controller/python/test/test_scripts/network_commissioning.py
@@ -198,7 +198,7 @@ async def test_wifi(self, endpointId):
         logger.info(f"Connect to a network")
         req = Clusters.NetworkCommissioning.Commands.ConnectNetwork(
             networkID=TEST_WIFI_SSID.encode(), breadcrumb=self.with_breadcrumb())
-        res = await self._devCtrl.SendCommand(nodeid=self._nodeid, endpoint=endpointId, payload=req)
+        res = await self._devCtrl.SendCommand(nodeid=self._nodeid, endpoint=endpointId, payload=req, interactionTimeoutMs=60000)
         logger.info(f"Got response: {res}")
         if res.networkingStatus != Clusters.NetworkCommissioning.Enums.NetworkCommissioningStatus.kSuccess:
             raise AssertionError(f"Unexpected result: {res.networkingStatus}")
diff --git a/src/transport/SecureSession.h b/src/transport/SecureSession.h
index 41c22c04ece5dc..9cda82de36d4df 100644
--- a/src/transport/SecureSession.h
+++ b/src/transport/SecureSession.h
@@ -162,7 +162,8 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
         switch (mPeerAddress.GetTransportType())
         {
         case Transport::Type::kUdp:
-            return GetRemoteMRPConfig().mIdleRetransTimeout * (CHIP_CONFIG_RMP_DEFAULT_MAX_RETRANS + 1);
+            return GetRetransmissionTimeout(mRemoteMRPConfig.mActiveRetransTimeout, mRemoteMRPConfig.mIdleRetransTimeout,
+                                            GetLastPeerActivityTime());
         case Transport::Type::kTcp:
             return System::Clock::Seconds16(30);
         case Transport::Type::kBle:
@@ -222,7 +223,8 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
 
     bool IsPeerActive() const
     {
-        return ((System::SystemClock().GetMonotonicTimestamp() - GetLastPeerActivityTime()) < kMinActiveTime);
+        return ((System::SystemClock().GetMonotonicTimestamp() - GetLastPeerActivityTime()) <
+                GetRetransmissionTimeout(mRemoteMRPConfig.mActiveRetransTimeout));
     }
 
     System::Clock::Timestamp GetMRPBaseTimeout() const override
diff --git a/src/transport/Session.h b/src/transport/Session.h
index e55c4547699864..86601423935c81 100644
--- a/src/transport/Session.h
+++ b/src/transport/Session.h
@@ -157,8 +157,6 @@ class UnauthenticatedSession;
 class IncomingGroupSession;
 class OutgoingGroupSession;
 
-constexpr System::Clock::Milliseconds32 kMinActiveTime = System::Clock::Milliseconds32(4000);
-
 class Session
 {
 public:
diff --git a/src/transport/UnauthenticatedSessionTable.h b/src/transport/UnauthenticatedSessionTable.h
index 69de82451c2e73..c9ff44d722e637 100644
--- a/src/transport/UnauthenticatedSessionTable.h
+++ b/src/transport/UnauthenticatedSessionTable.h
@@ -87,7 +87,8 @@ class UnauthenticatedSession : public Session,
         switch (mPeerAddress.GetTransportType())
         {
         case Transport::Type::kUdp:
-            return GetRemoteMRPConfig().mIdleRetransTimeout * (CHIP_CONFIG_RMP_DEFAULT_MAX_RETRANS + 1);
+            return GetRetransmissionTimeout(mRemoteMRPConfig.mActiveRetransTimeout, mRemoteMRPConfig.mIdleRetransTimeout,
+                                            GetLastPeerActivityTime());
         case Transport::Type::kTcp:
             return System::Clock::Seconds16(30);
         default:
@@ -113,7 +114,8 @@ class UnauthenticatedSession : public Session,
 
     bool IsPeerActive() const
     {
-        return ((System::SystemClock().GetMonotonicTimestamp() - GetLastPeerActivityTime()) < kMinActiveTime);
+        return ((System::SystemClock().GetMonotonicTimestamp() - GetLastPeerActivityTime()) <
+                GetRetransmissionTimeout(mRemoteMRPConfig.mActiveRetransTimeout));
     }
 
     System::Clock::Timestamp GetMRPBaseTimeout() const override