From fe148f78237524cf09c90b8445d9b54712cfaaf2 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Sat, 18 Jan 2020 15:55:50 -0500
Subject: [PATCH] merge conflict fix

---
 llarp/router/rc_lookup_handler.cpp | 2 +-
 llarp/router/router.cpp            | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/llarp/router/rc_lookup_handler.cpp b/llarp/router/rc_lookup_handler.cpp
index 6998469de..9883d6ce6 100644
--- a/llarp/router/rc_lookup_handler.cpp
+++ b/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);
diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp
index 3b9c25165..29c4b2baf 100644
--- a/llarp/router/router.cpp
+++ b/llarp/router/router.cpp
@@ -698,7 +698,10 @@ namespace llarp
       connected += _linkManager.NumberOfPendingConnections();
     }
 
-    _rcLookupHandler.ExploreNetwork();
+    const int interval = isSvcNode ? 30 : 5;
+
+    if((Uptime() / 1000) % interval == 0)
+      _rcLookupHandler.ExploreNetwork();
 
     size_t connectToNum      = _outboundSessionMaker.minConnectedRouters;
     const auto strictConnect = _rcLookupHandler.NumberOfStrictConnectRouters();