Fix MRP baseTimeout calculation when it is possible the other end fall asleep

Author: yunhanw-google

src/messaging/ReliableMessageProtocolConfig.cpp

@@ -135,7 +135,7 @@ System::Clock::Timeout GetRetransmissionTimeout(System::Clock::Timeout activeInt
     System::Clock::Timestamp timeout(0);
     for (uint8_t i = 0; i < CHIP_CONFIG_RMP_DEFAULT_MAX_RETRANS + 1; i++)
     {
-        auto baseInterval = ((timeSinceLastActivity + timeout) < activityThreshold) ? activeInterval : idleInterval;
+        auto baseInterval = activeInterval;
         timeout += Messaging::ReliableMessageMgr::GetBackoff(baseInterval, i, /* computeMaxPossible */ true);
     }
 

src/transport/SecureSession.h

@@ -263,10 +263,7 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
                 GetRemoteMRPConfig().mActiveThresholdTime);
     }
 
-    System::Clock::Timestamp GetMRPBaseTimeout() const override
-    {
-        return IsPeerActive() ? GetRemoteMRPConfig().mActiveRetransTimeout : GetRemoteMRPConfig().mIdleRetransTimeout;
-    }
+    System::Clock::Timestamp GetMRPBaseTimeout() const override { return GetRemoteMRPConfig().mActiveRetransTimeout; }
 
     CryptoContext & GetCryptoContext() { return mCryptoContext; }
 

src/transport/UnauthenticatedSessionTable.h

@@ -153,10 +153,7 @@ class UnauthenticatedSession : public Session, public ReferenceCounted<Unauthent
                 GetRemoteMRPConfig().mActiveThresholdTime);
     }
 
-    System::Clock::Timestamp GetMRPBaseTimeout() const override
-    {
-        return IsPeerActive() ? GetRemoteMRPConfig().mActiveRetransTimeout : GetRemoteMRPConfig().mIdleRetransTimeout;
-    }
+    System::Clock::Timestamp GetMRPBaseTimeout() const override { return GetRemoteMRPConfig().mActiveRetransTimeout; }
 
     void SetRemoteSessionParameters(const SessionParameters & sessionParams) { mRemoteSessionParams = sessionParams; }