Check idle peers every 4 seconds

Charge for bad TMSquelch
Update comments

Author: gregtatcam

src/ripple/app/misc/HashRouter.cpp

@@ -50,8 +50,7 @@ HashRouter::addSuppression(uint256 const& key)
 bool
 HashRouter::addSuppressionPeer(uint256 const& key, PeerShortID peer)
 {
-    auto [added, _] = addSuppressionPeerWithStatus(key, peer);
-    return added;
+    return addSuppressionPeerWithStatus(key, peer).first;
 }
 
 std::pair<bool, std::optional<Stopwatch::time_point>>

src/ripple/core/Config.h

@@ -179,7 +179,7 @@ class Config : public BasicConfig
     // Thread pool configuration
     std::size_t WORKERS = 0;
 
-    // Reduce-relay
+    // Reduce-relay - these parameters are experimental.
     // Enable reduce-relay functionality
     bool REDUCE_RELAY_ENABLE = false;
     // Send squelch message to peers

src/ripple/overlay/Overlay.h

@@ -147,22 +147,24 @@ class Overlay : public Stoppable, public beast::PropertyStream::Source
     virtual void
     broadcast(protocol::TMValidation& m) = 0;
 
-    /** Relay a proposal. Return set
-     * of peers, which have already seen the
-     * message; i.e. the message has been
-     * received from these peers and added
-     * to the hash router */
+    /** Relay a proposal.
+     * @param m the serialized proposal
+     * @param uid the id used to identify this proposal
+     * @param validator The pubkey of the validator that issued this proposal
+     * @return the set of peers which have already sent us this proposal
+     */
     virtual std::set<Peer::id_t>
     relay(
         protocol::TMProposeSet& m,
         uint256 const& uid,
         PublicKey const& validator) = 0;
 
-    /** Relay a validation. Return set
-     * of peers, which have already seen the
-     * message; i.e. the message has been
-     * received from these peers and added
-     * to the hash router */
+    /** Relay a validation.
+     * @param m the serialized validation
+     * @param uid the id used to identify this validation
+     * @param validator The pubkey of the validator that issued this validation
+     * @return the set of peers which have already sent us this validation
+     */
     virtual std::set<Peer::id_t>
     relay(
         protocol::TMValidation& m,

src/ripple/overlay/impl/OverlayImpl.cpp

@@ -99,11 +99,13 @@ OverlayImpl::Timer::on_timer(error_code ec)
     overlay_.m_peerFinder->once_per_second();
     overlay_.sendEndpoints();
     overlay_.autoConnect();
-    overlay_.deleteIdlePeers();
 
     if ((++overlay_.timer_count_ % Tuning::checkSeconds) == 0)
         overlay_.check();
 
+    if ((overlay_.timer_count_ % Tuning::checkIdlePeers) == 0)
+        overlay_.deleteIdlePeers();
+
     timer_.expires_from_now(std::chrono::seconds(1));
     timer_.async_wait(overlay_.strand_.wrap(std::bind(
         &Timer::on_timer, shared_from_this(), std::placeholders::_1)));

src/ripple/overlay/impl/PeerImp.cpp

@@ -2358,14 +2358,14 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMSquelch> const& m)
 {
     if (!m->has_validatorpubkey())
     {
-        JLOG(p_journal_.debug()) << "onMessage: TMSquelch, missing public key";
+        charge(Resource::feeBadData);
         return;
     }
     auto validator = m->validatorpubkey();
     auto const slice{makeSlice(validator)};
     if (!publicKeyType(slice))
     {
-        JLOG(p_journal_.debug()) << "onMessage: TMSquelch, invalid public key";
+        charge(Resource::feeBadData);
         return;
     }
     PublicKey key(slice);

src/ripple/overlay/impl/Tuning.h

@@ -71,6 +71,9 @@ enum {
 
     /** How often to log send queue size */
     sendQueueLogFreq = 64,
+
+    /** How often we check for idle peers (seconds) */
+    checkIdlePeers = 4,
 };
 
 /** The threshold above which we treat a peer connection as high latency */