|
|
@ -366,7 +366,6 @@ namespace llarp
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(results[0].Verify(crypto(), Now()))
|
|
|
|
if(results[0].Verify(crypto(), Now()))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
nodedb()->Insert(results[0]);
|
|
|
|
|
|
|
|
TryConnectAsync(results[0], 10);
|
|
|
|
TryConnectAsync(results[0], 10);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -415,11 +414,6 @@ namespace llarp
|
|
|
|
if(remote.Verify(crypto(), Now()))
|
|
|
|
if(remote.Verify(crypto(), Now()))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
LogDebug("verified signature");
|
|
|
|
LogDebug("verified signature");
|
|
|
|
// store into filesystem
|
|
|
|
|
|
|
|
if(!nodedb()->Insert(remote))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
LogWarn("failed to store");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!TryConnectAsync(remote, 10))
|
|
|
|
if(!TryConnectAsync(remote, 10))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// or error?
|
|
|
|
// or error?
|
|
|
@ -616,11 +610,11 @@ namespace llarp
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if(!rc.Verify(crypto(), Now()))
|
|
|
|
if(!rc.Verify(crypto(), Now()))
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
nodedb()->Insert(rc);
|
|
|
|
nodedb()->InsertAsync(rc);
|
|
|
|
|
|
|
|
|
|
|
|
if(ConnectionToRouterAllowed(rc.pubkey)
|
|
|
|
if(ConnectionToRouterAllowed(rc.pubkey)
|
|
|
|
&& numConnected < minConnectedRouters)
|
|
|
|
&& numConnected < minConnectedRouters)
|
|
|
|
TryEstablishTo(rc.pubkey);
|
|
|
|
TryConnectAsync(rc, 10);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -684,7 +678,6 @@ namespace llarp
|
|
|
|
if(whitelistRouters
|
|
|
|
if(whitelistRouters
|
|
|
|
&& lokinetRouters.find(result.pubkey) == lokinetRouters.end())
|
|
|
|
&& lokinetRouters.find(result.pubkey) == lokinetRouters.end())
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
nodedb()->Insert(result);
|
|
|
|
|
|
|
|
TryConnectAsync(result, 10);
|
|
|
|
TryConnectAsync(result, 10);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1093,7 +1086,8 @@ namespace llarp
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
size_t N = nodedb()->num_loaded();
|
|
|
|
const size_t connected = NumberOfConnectedRouters();
|
|
|
|
|
|
|
|
const size_t N = nodedb()->num_loaded();
|
|
|
|
if(N < minRequiredRouters)
|
|
|
|
if(N < minRequiredRouters)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
LogInfo("We need at least ", minRequiredRouters,
|
|
|
|
LogInfo("We need at least ", minRequiredRouters,
|
|
|
@ -1110,8 +1104,6 @@ namespace llarp
|
|
|
|
else
|
|
|
|
else
|
|
|
|
LogError("we have no bootstrap nodes specified");
|
|
|
|
LogError("we have no bootstrap nodes specified");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const size_t connected = NumberOfConnectedRouters();
|
|
|
|
|
|
|
|
if(connected < minConnectedRouters)
|
|
|
|
if(connected < minConnectedRouters)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
size_t dlt = minConnectedRouters - connected;
|
|
|
|
size_t dlt = minConnectedRouters - connected;
|
|
|
|