From 24094045f944743c1b62e6ca686f6aa12a9dcc44 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <vnicolas@apple.com>
Date: Sat, 22 Oct 2022 08:39:30 +0200
Subject: [PATCH] Make GetMRPBaseTimeout method const (#23300)

---
 src/transport/GroupSession.h                | 4 ++--
 src/transport/SecureSession.h               | 7 +++++--
 src/transport/Session.h                     | 2 +-
 src/transport/UnauthenticatedSessionTable.h | 7 +++++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/transport/GroupSession.h b/src/transport/GroupSession.h
index 2bc2d82345e151..bd3ab1931c2c7c 100644
--- a/src/transport/GroupSession.h
+++ b/src/transport/GroupSession.h
@@ -66,7 +66,7 @@ class IncomingGroupSession : public Session, public ReferenceCounted<IncomingGro
         return cfg;
     }
 
-    System::Clock::Timestamp GetMRPBaseTimeout() override { return System::Clock::kZero; }
+    System::Clock::Timestamp GetMRPBaseTimeout() const override { return System::Clock::kZero; }
 
     System::Clock::Milliseconds32 GetAckTimeout() const override
     {
@@ -117,7 +117,7 @@ class OutgoingGroupSession : public Session, public ReferenceCounted<OutgoingGro
         return cfg;
     }
 
-    System::Clock::Timestamp GetMRPBaseTimeout() override { return System::Clock::kZero; }
+    System::Clock::Timestamp GetMRPBaseTimeout() const override { return System::Clock::kZero; }
 
     System::Clock::Milliseconds32 GetAckTimeout() const override
     {
diff --git a/src/transport/SecureSession.h b/src/transport/SecureSession.h
index 34542f752d15e4..41c22c04ece5dc 100644
--- a/src/transport/SecureSession.h
+++ b/src/transport/SecureSession.h
@@ -220,9 +220,12 @@ class SecureSession : public Session, public ReferenceCounted<SecureSession, Sec
         }
     }
 
-    bool IsPeerActive() { return ((System::SystemClock().GetMonotonicTimestamp() - GetLastPeerActivityTime()) < kMinActiveTime); }
+    bool IsPeerActive() const
+    {
+        return ((System::SystemClock().GetMonotonicTimestamp() - GetLastPeerActivityTime()) < kMinActiveTime);
+    }
 
-    System::Clock::Timestamp GetMRPBaseTimeout() override
+    System::Clock::Timestamp GetMRPBaseTimeout() const override
     {
         return IsPeerActive() ? GetRemoteMRPConfig().mActiveRetransTimeout : GetRemoteMRPConfig().mIdleRetransTimeout;
     }
diff --git a/src/transport/Session.h b/src/transport/Session.h
index 52c2868871bf39..e55c4547699864 100644
--- a/src/transport/Session.h
+++ b/src/transport/Session.h
@@ -199,7 +199,7 @@ class Session
     virtual Access::SubjectDescriptor GetSubjectDescriptor() const           = 0;
     virtual bool RequireMRP() const                                          = 0;
     virtual const ReliableMessageProtocolConfig & GetRemoteMRPConfig() const = 0;
-    virtual System::Clock::Timestamp GetMRPBaseTimeout()                     = 0;
+    virtual System::Clock::Timestamp GetMRPBaseTimeout() const               = 0;
     virtual System::Clock::Milliseconds32 GetAckTimeout() const              = 0;
 
     // Returns a suggested timeout value based on the round-trip time it takes for the peer at the other end of the session to
diff --git a/src/transport/UnauthenticatedSessionTable.h b/src/transport/UnauthenticatedSessionTable.h
index a19fb2d908f262..69de82451c2e73 100644
--- a/src/transport/UnauthenticatedSessionTable.h
+++ b/src/transport/UnauthenticatedSessionTable.h
@@ -111,9 +111,12 @@ class UnauthenticatedSession : public Session,
     const PeerAddress & GetPeerAddress() const { return mPeerAddress; }
     void SetPeerAddress(const PeerAddress & peerAddress) { mPeerAddress = peerAddress; }
 
-    bool IsPeerActive() { return ((System::SystemClock().GetMonotonicTimestamp() - GetLastPeerActivityTime()) < kMinActiveTime); }
+    bool IsPeerActive() const
+    {
+        return ((System::SystemClock().GetMonotonicTimestamp() - GetLastPeerActivityTime()) < kMinActiveTime);
+    }
 
-    System::Clock::Timestamp GetMRPBaseTimeout() override
+    System::Clock::Timestamp GetMRPBaseTimeout() const override
     {
         return IsPeerActive() ? GetRemoteMRPConfig().mActiveRetransTimeout : GetRemoteMRPConfig().mIdleRetransTimeout;
     }