Merge pull request #1050 from majestrate/tweak-limits-2020-01-16

Tweak limits

llarp/router/rc_lookup_handler.cpp

@@ -255,8 +255,8 @@ namespace llarp
 
     if(useWhitelist)
     {
-      static constexpr size_t LookupPerTick   = 25;
       static constexpr auto RerequestInterval = 10min;
+      static constexpr size_t LookupPerTick   = 5;
 
       std::vector< RouterID > lookupRouters;
       lookupRouters.reserve(LookupPerTick);

llarp/router/router.cpp

@@ -59,7 +59,8 @@ namespace llarp
 
     _stopping.store(false);
     _running.store(false);
-    _lastTick = llarp::time_now_ms();
+    _lastTick       = llarp::time_now_ms();
+    m_NextExploreAt = Clock_t::now();
   }
 
   Router::~Router()
@@ -698,8 +699,13 @@ namespace llarp
       connected += _linkManager.NumberOfPendingConnections();
     }
 
-    _rcLookupHandler.ExploreNetwork();
-
+    const int interval       = isSvcNode ? 5 : 2;
+    const auto timepoint_now = Clock_t::now();
+    if(timepoint_now >= m_NextExploreAt)
+    {
+      _rcLookupHandler.ExploreNetwork();
+      m_NextExploreAt = timepoint_now + std::chrono::seconds(interval);
+    }
     size_t connectToNum      = _outboundSessionMaker.minConnectedRouters;
     const auto strictConnect = _rcLookupHandler.NumberOfStrictConnectRouters();
     if(strictConnect > 0 && connectToNum > strictConnect)

llarp/router/router.hpp

@@ -274,6 +274,11 @@ namespace llarp
     LinkManager _linkManager;
     RCLookupHandler _rcLookupHandler;
 
+    using Clock_t     = std::chrono::steady_clock;
+    using TimePoint_t = Clock_t::time_point;
+
+    TimePoint_t m_NextExploreAt;
+
     IOutboundMessageHandler &
     outboundMessageHandler() override
     {