|
|
|
|
@ -163,13 +163,7 @@ llarp_router::PersistSessionUntil(const llarp::RouterID &remote,
|
|
|
|
|
llarp_time_t until)
|
|
|
|
|
{
|
|
|
|
|
llarp::LogDebug("persist session to ", remote, " until ", until);
|
|
|
|
|
if(m_PersistingSessions.find(remote) == m_PersistingSessions.end())
|
|
|
|
|
m_PersistingSessions[remote] = until;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if(m_PersistingSessions[remote] < until)
|
|
|
|
|
m_PersistingSessions[remote] = until;
|
|
|
|
|
}
|
|
|
|
|
m_PersistingSessions[remote] = std::max(until, m_PersistingSessions[remote]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
constexpr size_t MaxPendingSendQueueSize = 8;
|
|
|
|
|
@ -369,7 +363,7 @@ llarp_router::on_verify_client_rc(llarp_async_verify_rc *job)
|
|
|
|
|
llarp::PubKey pk(job->rc.pubkey);
|
|
|
|
|
router->FlushOutboundFor(pk, router->GetLinkWithSessionByPubkey(pk));
|
|
|
|
|
delete ctx;
|
|
|
|
|
delete job;
|
|
|
|
|
router->pendingVerifyRC.erase(pk);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
@ -387,8 +381,9 @@ llarp_router::on_verify_server_rc(llarp_async_verify_rc *job)
|
|
|
|
|
ctx->establish_job->Failed();
|
|
|
|
|
}
|
|
|
|
|
delete ctx;
|
|
|
|
|
delete job;
|
|
|
|
|
router->DiscardOutboundFor(pk);
|
|
|
|
|
router->pendingVerifyRC.erase(pk);
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// we're valid, which means it's already been committed to the nodedb
|
|
|
|
|
@ -418,7 +413,7 @@ llarp_router::on_verify_server_rc(llarp_async_verify_rc *job)
|
|
|
|
|
else
|
|
|
|
|
router->FlushOutboundFor(pk, router->GetLinkWithSessionByPubkey(pk));
|
|
|
|
|
delete ctx;
|
|
|
|
|
delete job;
|
|
|
|
|
router->pendingVerifyRC.erase(pk);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
@ -616,19 +611,21 @@ llarp_router::GetLinkWithSessionByPubkey(const llarp::RouterID &pubkey)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
llarp_router::FlushOutboundFor(const llarp::RouterID remote,
|
|
|
|
|
llarp_router::FlushOutboundFor(llarp::RouterID remote,
|
|
|
|
|
llarp::ILinkLayer *chosen)
|
|
|
|
|
{
|
|
|
|
|
llarp::LogDebug("Flush outbound for ", remote);
|
|
|
|
|
pendingEstablishJobs.erase(remote);
|
|
|
|
|
|
|
|
|
|
auto itr = outboundMessageQueue.find(remote);
|
|
|
|
|
if(itr == outboundMessageQueue.end())
|
|
|
|
|
{
|
|
|
|
|
pendingEstablishJobs.erase(remote);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if(!chosen)
|
|
|
|
|
{
|
|
|
|
|
DiscardOutboundFor(remote);
|
|
|
|
|
pendingEstablishJobs.erase(remote);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
while(itr->second.size())
|
|
|
|
|
@ -640,6 +637,7 @@ llarp_router::FlushOutboundFor(const llarp::RouterID remote,
|
|
|
|
|
|
|
|
|
|
itr->second.pop();
|
|
|
|
|
}
|
|
|
|
|
pendingEstablishJobs.erase(remote);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
@ -667,7 +665,18 @@ void
|
|
|
|
|
llarp_router::async_verify_RC(const llarp::RouterContact &rc,
|
|
|
|
|
llarp::ILinkLayer *link)
|
|
|
|
|
{
|
|
|
|
|
llarp_async_verify_rc *job = new llarp_async_verify_rc();
|
|
|
|
|
if(pendingVerifyRC.count(rc.pubkey))
|
|
|
|
|
return;
|
|
|
|
|
if(rc.IsPublicRouter() && whitelistRouters)
|
|
|
|
|
{
|
|
|
|
|
if(lokinetRouters.find(rc.pubkey) == lokinetRouters.end())
|
|
|
|
|
{
|
|
|
|
|
llarp::LogInfo(rc.pubkey, " is NOT a valid service node, rejecting");
|
|
|
|
|
link->CloseSessionTo(rc.pubkey);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
llarp_async_verify_rc *job = &pendingVerifyRC[rc.pubkey];
|
|
|
|
|
llarp::async_verify_context *ctx = new llarp::async_verify_context();
|
|
|
|
|
ctx->router = this;
|
|
|
|
|
ctx->establish_job = nullptr;
|
|
|
|
|
@ -690,17 +699,7 @@ llarp_router::async_verify_RC(const llarp::RouterContact &rc,
|
|
|
|
|
job->hook = &llarp_router::on_verify_server_rc;
|
|
|
|
|
else
|
|
|
|
|
job->hook = &llarp_router::on_verify_client_rc;
|
|
|
|
|
if(rc.IsPublicRouter() && whitelistRouters)
|
|
|
|
|
{
|
|
|
|
|
if(lokinetRouters.find(rc.pubkey) == lokinetRouters.end())
|
|
|
|
|
{
|
|
|
|
|
llarp::LogInfo(rc.pubkey, " is NOT a valid service node, rejecting");
|
|
|
|
|
link->CloseSessionTo(rc.pubkey);
|
|
|
|
|
job->valid = false;
|
|
|
|
|
job->hook(job);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
llarp_nodedb_async_verify(job);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -838,24 +837,17 @@ llarp_router::Run()
|
|
|
|
|
llarp::LogWarn("Link ", link->Name(), " failed to start");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
llarp::LogInfo("starting hidden service context...");
|
|
|
|
|
if(!hiddenServiceContext.StartAll())
|
|
|
|
|
{
|
|
|
|
|
llarp::LogError("Failed to start hidden service context");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint64_t delay = ((llarp_randint() % 10) * 500) + 500;
|
|
|
|
|
if(IBLinksStarted > 0)
|
|
|
|
|
{
|
|
|
|
|
// initialize as service node
|
|
|
|
|
if(!InitServiceNode())
|
|
|
|
|
{
|
|
|
|
|
llarp::LogError("Failed to initialize service node");
|
|
|
|
|
Close();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// immediate connect all for service node
|
|
|
|
|
uint64_t delay = llarp_randint() % 100;
|
|
|
|
|
llarp_logic_call_later(logic, {delay, this, &ConnectAll});
|
|
|
|
|
delay = llarp_randint() % 50;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
@ -868,75 +860,32 @@ llarp_router::Run()
|
|
|
|
|
if(!_rc.Sign(&crypto, identity))
|
|
|
|
|
{
|
|
|
|
|
llarp::LogError("failed to regenerate keys and sign RC");
|
|
|
|
|
Close();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// don't create default if we already have some defined
|
|
|
|
|
if(this->ShouldCreateDefaultHiddenService())
|
|
|
|
|
// generate default hidden service
|
|
|
|
|
llarp::LogInfo("setting up default network endpoint");
|
|
|
|
|
if(!CreateDefaultHiddenService())
|
|
|
|
|
{
|
|
|
|
|
// generate default hidden service
|
|
|
|
|
if(!CreateDefaultHiddenService())
|
|
|
|
|
return;
|
|
|
|
|
llarp::LogError("failed to set up default network endpoint");
|
|
|
|
|
Close();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// delayed connect all for clients
|
|
|
|
|
uint64_t delay = ((llarp_randint() % 10) * 500) + 500;
|
|
|
|
|
llarp_logic_call_later(logic, {delay, this, &ConnectAll});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
llarp::LogInfo("starting hidden service context...");
|
|
|
|
|
if(!hiddenServiceContext.StartAll())
|
|
|
|
|
{
|
|
|
|
|
llarp::LogError("Failed to start hidden service context");
|
|
|
|
|
Close();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
llarp::PubKey ourPubkey = pubkey();
|
|
|
|
|
llarp::LogInfo("starting dht context as ", ourPubkey);
|
|
|
|
|
llarp_dht_context_start(dht, ourPubkey);
|
|
|
|
|
|
|
|
|
|
ScheduleTicker(1000);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
llarp_router::ShouldCreateDefaultHiddenService()
|
|
|
|
|
{
|
|
|
|
|
// llarp::LogInfo("IfName: ", this->defaultIfName, " defaultIfName: ",
|
|
|
|
|
// this->defaultIfName);
|
|
|
|
|
if(this->defaultIfName == "auto" || this->defaultIfName == "auto")
|
|
|
|
|
{
|
|
|
|
|
// auto detect if we have any pre-defined endpoints
|
|
|
|
|
// no if we have a endpoints
|
|
|
|
|
if(hiddenServiceContext.hasEndpoints())
|
|
|
|
|
{
|
|
|
|
|
llarp::LogInfo("Auto mode detected and we have endpoints");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
// we don't have any endpoints, auto configure settings
|
|
|
|
|
|
|
|
|
|
// set a default IP range
|
|
|
|
|
this->defaultIfAddr = llarp::findFreePrivateRange();
|
|
|
|
|
if(this->defaultIfAddr == "")
|
|
|
|
|
{
|
|
|
|
|
llarp::LogError(
|
|
|
|
|
"Could not find any free lokitun interface names, can't auto set up "
|
|
|
|
|
"default HS context for client");
|
|
|
|
|
this->defaultIfAddr = "no";
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// pick an ifName
|
|
|
|
|
this->defaultIfName = llarp::findFreeLokiTunIfName();
|
|
|
|
|
if(this->defaultIfName == "")
|
|
|
|
|
{
|
|
|
|
|
llarp::LogError(
|
|
|
|
|
"Could not find any free private ip ranges, can't auto set up "
|
|
|
|
|
"default HS context for client");
|
|
|
|
|
this->defaultIfName = "no";
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
// auto config'd, go ahead and create it
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
// not auto mode then just check to make sure it's explicitly disabled
|
|
|
|
|
if(this->defaultIfAddr != "" && this->defaultIfAddr != "no"
|
|
|
|
|
&& this->defaultIfName != "" && this->defaultIfName != "no")
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
// delayed connect all
|
|
|
|
|
llarp_logic_call_later(logic, {delay, this, &ConnectAll});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
@ -945,8 +894,7 @@ llarp_router::InitServiceNode()
|
|
|
|
|
llarp::LogInfo("accepting transit traffic");
|
|
|
|
|
paths.AllowTransit();
|
|
|
|
|
llarp_dht_allow_transit(dht);
|
|
|
|
|
exitContext.AddExitEndpoint("default-connectivity", exitConf);
|
|
|
|
|
return true;
|
|
|
|
|
return exitContext.AddExitEndpoint("default-connectivity", netConfig);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
@ -1028,14 +976,26 @@ llarp_router::InitOutboundLink()
|
|
|
|
|
bool
|
|
|
|
|
llarp_router::CreateDefaultHiddenService()
|
|
|
|
|
{
|
|
|
|
|
if(upstreamResolvers.size())
|
|
|
|
|
return hiddenServiceContext.AddDefaultEndpoint(defaultIfAddr, defaultIfName,
|
|
|
|
|
upstreamResolvers.front(),
|
|
|
|
|
resolverBindAddr);
|
|
|
|
|
else
|
|
|
|
|
return hiddenServiceContext.AddDefaultEndpoint(defaultIfAddr, defaultIfName,
|
|
|
|
|
defaultUpstreamResolver,
|
|
|
|
|
resolverBindAddr);
|
|
|
|
|
// fallback defaults
|
|
|
|
|
static const std::unordered_map< std::string,
|
|
|
|
|
std::function< std::string(void) > >
|
|
|
|
|
netConfigDefaults = {
|
|
|
|
|
{"ifname", llarp::findFreeLokiTunIfName},
|
|
|
|
|
{"ifaddr", llarp::findFreePrivateRange},
|
|
|
|
|
{"local-dns", []() -> std::string { return "127.0.0.1:53"; }},
|
|
|
|
|
{"upstream-dns", []() -> std::string { return "1.1.1.1:53"; }}};
|
|
|
|
|
// populate with fallback defaults if values not present
|
|
|
|
|
auto itr = netConfigDefaults.begin();
|
|
|
|
|
while(itr != netConfigDefaults.end())
|
|
|
|
|
{
|
|
|
|
|
if(netConfig.count(itr->first) == 0)
|
|
|
|
|
{
|
|
|
|
|
netConfig.emplace(std::make_pair(itr->first, itr->second()));
|
|
|
|
|
}
|
|
|
|
|
++itr;
|
|
|
|
|
}
|
|
|
|
|
// add endpoint
|
|
|
|
|
return hiddenServiceContext.AddDefaultEndpoint(netConfig);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
@ -1242,14 +1202,6 @@ namespace llarp
|
|
|
|
|
}
|
|
|
|
|
else if(StrEq(section, "network"))
|
|
|
|
|
{
|
|
|
|
|
if(StrEq(key, "ifaddr"))
|
|
|
|
|
{
|
|
|
|
|
self->defaultIfAddr = val;
|
|
|
|
|
}
|
|
|
|
|
if(StrEq(key, "ifname"))
|
|
|
|
|
{
|
|
|
|
|
self->defaultIfName = val;
|
|
|
|
|
}
|
|
|
|
|
if(StrEq(key, "profiles"))
|
|
|
|
|
{
|
|
|
|
|
self->routerProfilesFile = val;
|
|
|
|
|
@ -1258,7 +1210,7 @@ namespace llarp
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
self->exitConf.insert(std::make_pair(key, val));
|
|
|
|
|
self->netConfig.insert(std::make_pair(key, val));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if(StrEq(section, "api"))
|
|
|
|
|
@ -1303,12 +1255,12 @@ namespace llarp
|
|
|
|
|
if(StrEq(key, "upstream"))
|
|
|
|
|
{
|
|
|
|
|
llarp::LogInfo("add upstream resolver ", val);
|
|
|
|
|
self->upstreamResolvers.push_back(val);
|
|
|
|
|
self->netConfig.emplace(std::make_pair("upstream-dns", val));
|
|
|
|
|
}
|
|
|
|
|
if(StrEq(key, "bind"))
|
|
|
|
|
{
|
|
|
|
|
llarp::LogInfo("set local dns to ", val);
|
|
|
|
|
self->resolverBindAddr = val;
|
|
|
|
|
self->netConfig.emplace(std::make_pair("local-dns", val));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if(StrEq(section, "connect"))
|
|
|
|
|
|
Ryan Tharp
6 years ago