merge conflict fix

This commit is contained in:
Jeff Becker 2020-01-18 15:55:50 -05:00
parent 493213717f
commit fe148f7823
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
2 changed files with 5 additions and 2 deletions

View File

@ -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);

View File

@ -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();