From cdb9f8c21f04cc14e2c1154ffaa94daf8e3e0861 Mon Sep 17 00:00:00 2001
From: Valentin Balaschenko <13349202+vlntb@users.noreply.github.com>
Date: Thu, 17 Apr 2025 10:54:03 +0100
Subject: [PATCH] increase max ping

---
 src/xrpld/overlay/detail/PeerImp.cpp | 27 ++++++++++++++++++++-------
 src/xrpld/overlay/detail/PeerImp.h   |  6 ++++--
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp
index 5270f33e3d..2372987601 100644
--- a/src/xrpld/overlay/detail/PeerImp.cpp
+++ b/src/xrpld/overlay/detail/PeerImp.cpp
@@ -57,7 +57,10 @@ namespace {
 std::chrono::milliseconds constexpr peerHighLatency{300};
 
 /** How often we PING the peer to check for latency and sendq probe */
-std::chrono::seconds constexpr peerTimerInterval{300};
+std::chrono::seconds constexpr peerTimerInterval{60};
+
+uint16_t constexpr maxPingNumber = 5;
+
 }  // namespace
 
 // TODO: Remove this exclusion once unit tests are added after the hotfix
@@ -604,7 +607,7 @@ PeerImp::fail(std::string const& reason)
         return post(
             strand_,
             std::bind(
-                (void(Peer::*)(std::string const&)) & PeerImp::fail,
+                (void (Peer::*)(std::string const&))&PeerImp::fail,
                 shared_from_this(),
                 reason));
     if (journal_.active(beast::severities::kWarning) && socket_.is_open())
@@ -730,7 +733,13 @@ PeerImp::onTimer(error_code const& ec)
     }
 
     // Already waiting for PONG
-    if (lastPingSeq_)
+    if (lastPingSeq_ && (pingAttempts_ < maxPingNumber))
+    {
+        pingAttempts_++;
+        JLOG(journal_.info()) << "Missing PONG, sending PING, attempt "
+                              << pingAttempts_ << " of " << maxPingNumber;
+    }
+    else if (lastPingSeq_)
     {
         fail("Ping Timeout");
         return;
@@ -738,6 +747,7 @@ PeerImp::onTimer(error_code const& ec)
 
     lastPingTime_ = clock_type::now();
     lastPingSeq_ = rand_int<std::uint32_t>();
+    pingAttempts_ = 0;
 
     protocol::TMPing message;
     message.set_type(protocol::TMPing::ptPING);
@@ -1105,6 +1115,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMPing> const& m)
         if (m->seq() == lastPingSeq_)
         {
             lastPingSeq_.reset();
+            pingAttempts_ = 0;
 
             // Update latency estimate
             auto const rtt = std::chrono::round<std::chrono::milliseconds>(
@@ -1488,8 +1499,9 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMProofPathRequest> const& m)
                 }
                 else
                 {
-                    peer->send(std::make_shared<Message>(
-                        reply, protocol::mtPROOF_PATH_RESPONSE));
+                    peer->send(
+                        std::make_shared<Message>(
+                            reply, protocol::mtPROOF_PATH_RESPONSE));
                 }
             }
         });
@@ -1543,8 +1555,9 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMReplayDeltaRequest> const& m)
                 }
                 else
                 {
-                    peer->send(std::make_shared<Message>(
-                        reply, protocol::mtREPLAY_DELTA_RESPONSE));
+                    peer->send(
+                        std::make_shared<Message>(
+                            reply, protocol::mtREPLAY_DELTA_RESPONSE));
                 }
             }
         });
diff --git a/src/xrpld/overlay/detail/PeerImp.h b/src/xrpld/overlay/detail/PeerImp.h
index 459b359ffb..78e7c20062 100644
--- a/src/xrpld/overlay/detail/PeerImp.h
+++ b/src/xrpld/overlay/detail/PeerImp.h
@@ -112,6 +112,7 @@ private:
 
     std::optional<std::chrono::milliseconds> latency_;
     std::optional<std::uint32_t> lastPingSeq_;
+    uint16_t pingAttempts_ = 0;
     clock_type::time_point lastPingTime_;
     clock_type::time_point const creationTime_;
 
@@ -715,8 +716,9 @@ PeerImp::PeerImp(
           app_.config().LEDGER_REPLAY))
     , ledgerReplayMsgHandler_(app, app.getLedgerReplayer())
 {
-    read_buffer_.commit(boost::asio::buffer_copy(
-        read_buffer_.prepare(boost::asio::buffer_size(buffers)), buffers));
+    read_buffer_.commit(
+        boost::asio::buffer_copy(
+            read_buffer_.prepare(boost::asio::buffer_size(buffers)), buffers));
     JLOG(journal_.info()) << "compression enabled "
                           << (compressionEnabled_ == Compressed::On)
                           << " vp reduce-relay enabled "