|
|
|
@ -46,11 +46,12 @@ namespace llarp
|
|
|
|
namespace service
|
|
|
|
namespace service
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Endpoint::Endpoint(AbstractRouter* r, Context* parent)
|
|
|
|
Endpoint::Endpoint(AbstractRouter* r, Context* parent)
|
|
|
|
: path::Builder(r, 3, path::default_len)
|
|
|
|
: path::Builder{r, 3, path::default_len}
|
|
|
|
, context(parent)
|
|
|
|
, context{parent}
|
|
|
|
, m_InboundTrafficQueue(512)
|
|
|
|
, m_InboundTrafficQueue{512}
|
|
|
|
, m_SendQueue(512)
|
|
|
|
, m_SendQueue{512}
|
|
|
|
, m_RecvQueue(512)
|
|
|
|
, m_RecvQueue{512}
|
|
|
|
|
|
|
|
, m_IntrosetLookupFilter{5s}
|
|
|
|
{
|
|
|
|
{
|
|
|
|
m_state = std::make_unique<EndpointState>();
|
|
|
|
m_state = std::make_unique<EndpointState>();
|
|
|
|
m_state->m_Router = r;
|
|
|
|
m_state->m_Router = r;
|
|
|
|
@ -283,7 +284,8 @@ namespace llarp
|
|
|
|
{
|
|
|
|
{
|
|
|
|
RegenAndPublishIntroSet();
|
|
|
|
RegenAndPublishIntroSet();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// decay introset lookup filter
|
|
|
|
|
|
|
|
m_IntrosetLookupFilter.Decay(now);
|
|
|
|
// expire name cache
|
|
|
|
// expire name cache
|
|
|
|
m_state->nameCache.Decay(now);
|
|
|
|
m_state->nameCache.Decay(now);
|
|
|
|
// expire snode sessions
|
|
|
|
// expire snode sessions
|
|
|
|
@ -518,13 +520,15 @@ namespace llarp
|
|
|
|
void
|
|
|
|
void
|
|
|
|
Endpoint::ConvoTagTX(const ConvoTag& tag)
|
|
|
|
Endpoint::ConvoTagTX(const ConvoTag& tag)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Sessions()[tag].TX();
|
|
|
|
if (Sessions().count(tag))
|
|
|
|
|
|
|
|
Sessions()[tag].TX();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
|
Endpoint::ConvoTagRX(const ConvoTag& tag)
|
|
|
|
Endpoint::ConvoTagRX(const ConvoTag& tag)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Sessions()[tag].RX();
|
|
|
|
if (Sessions().count(tag))
|
|
|
|
|
|
|
|
Sessions()[tag].RX();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
bool
|
|
|
|
@ -620,8 +624,12 @@ namespace llarp
|
|
|
|
Endpoint* m_Endpoint;
|
|
|
|
Endpoint* m_Endpoint;
|
|
|
|
uint64_t m_relayOrder;
|
|
|
|
uint64_t m_relayOrder;
|
|
|
|
PublishIntroSetJob(
|
|
|
|
PublishIntroSetJob(
|
|
|
|
Endpoint* parent, uint64_t id, EncryptedIntroSet introset, uint64_t relayOrder)
|
|
|
|
Endpoint* parent,
|
|
|
|
: IServiceLookup(parent, id, "PublishIntroSet")
|
|
|
|
uint64_t id,
|
|
|
|
|
|
|
|
EncryptedIntroSet introset,
|
|
|
|
|
|
|
|
uint64_t relayOrder,
|
|
|
|
|
|
|
|
llarp_time_t timeout)
|
|
|
|
|
|
|
|
: IServiceLookup(parent, id, "PublishIntroSet", timeout)
|
|
|
|
, m_IntroSet(std::move(introset))
|
|
|
|
, m_IntroSet(std::move(introset))
|
|
|
|
, m_Endpoint(parent)
|
|
|
|
, m_Endpoint(parent)
|
|
|
|
, m_relayOrder(relayOrder)
|
|
|
|
, m_relayOrder(relayOrder)
|
|
|
|
@ -663,6 +671,8 @@ namespace llarp
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
constexpr auto PublishIntrosetTimeout = 20s;
|
|
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
bool
|
|
|
|
Endpoint::PublishIntroSetVia(
|
|
|
|
Endpoint::PublishIntroSetVia(
|
|
|
|
const EncryptedIntroSet& introset,
|
|
|
|
const EncryptedIntroSet& introset,
|
|
|
|
@ -670,7 +680,8 @@ namespace llarp
|
|
|
|
path::Path_ptr path,
|
|
|
|
path::Path_ptr path,
|
|
|
|
uint64_t relayOrder)
|
|
|
|
uint64_t relayOrder)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
auto job = new PublishIntroSetJob(this, GenTXID(), introset, relayOrder);
|
|
|
|
auto job =
|
|
|
|
|
|
|
|
new PublishIntroSetJob(this, GenTXID(), introset, relayOrder, PublishIntrosetTimeout);
|
|
|
|
if (job->SendRequestViaPath(path, r))
|
|
|
|
if (job->SendRequestViaPath(path, r))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
m_state->m_LastPublishAttempt = Now();
|
|
|
|
m_state->m_LastPublishAttempt = Now();
|
|
|
|
@ -747,6 +758,8 @@ namespace llarp
|
|
|
|
path::Builder::PathBuildStarted(path);
|
|
|
|
path::Builder::PathBuildStarted(path);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
constexpr auto MaxOutboundContextPerRemote = 4;
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
|
Endpoint::PutNewOutboundContext(const service::IntroSet& introset, llarp_time_t left)
|
|
|
|
Endpoint::PutNewOutboundContext(const service::IntroSet& introset, llarp_time_t left)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -755,7 +768,7 @@ namespace llarp
|
|
|
|
auto& remoteSessions = m_state->m_RemoteSessions;
|
|
|
|
auto& remoteSessions = m_state->m_RemoteSessions;
|
|
|
|
auto& serviceLookups = m_state->m_PendingServiceLookups;
|
|
|
|
auto& serviceLookups = m_state->m_PendingServiceLookups;
|
|
|
|
|
|
|
|
|
|
|
|
if (remoteSessions.count(addr) >= MAX_OUTBOUND_CONTEXT_COUNT)
|
|
|
|
if (remoteSessions.count(addr) >= MaxOutboundContextPerRemote)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
auto itr = remoteSessions.find(addr);
|
|
|
|
auto itr = remoteSessions.find(addr);
|
|
|
|
|
|
|
|
|
|
|
|
@ -930,9 +943,10 @@ namespace llarp
|
|
|
|
if (result)
|
|
|
|
if (result)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var::visit(
|
|
|
|
var::visit(
|
|
|
|
[&](auto&& value) {
|
|
|
|
[&result, &cache, name](auto&& value) {
|
|
|
|
if (value.IsZero())
|
|
|
|
if (value.IsZero())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
cache.Remove(name);
|
|
|
|
result = std::nullopt;
|
|
|
|
result = std::nullopt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
@ -942,10 +956,6 @@ namespace llarp
|
|
|
|
{
|
|
|
|
{
|
|
|
|
cache.Put(name, *result);
|
|
|
|
cache.Put(name, *result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
cache.Remove(name);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
handler(result);
|
|
|
|
handler(result);
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
@ -955,7 +965,7 @@ namespace llarp
|
|
|
|
for (const auto& path : paths)
|
|
|
|
for (const auto& path : paths)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
LogInfo(Name(), " lookup ", name, " from ", path->Endpoint());
|
|
|
|
LogInfo(Name(), " lookup ", name, " from ", path->Endpoint());
|
|
|
|
auto job = new LookupNameJob(this, GenTXID(), name, resultHandler);
|
|
|
|
auto job = new LookupNameJob{this, GenTXID(), name, resultHandler};
|
|
|
|
job->SendRequestViaPath(path, m_router);
|
|
|
|
job->SendRequestViaPath(path, m_router);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -1003,7 +1013,7 @@ namespace llarp
|
|
|
|
msg.S = path->NextSeqNo();
|
|
|
|
msg.S = path->NextSeqNo();
|
|
|
|
if (path && path->SendRoutingMessage(msg, Router()))
|
|
|
|
if (path && path->SendRoutingMessage(msg, Router()))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
RouterLookupJob job(this, handler);
|
|
|
|
RouterLookupJob job{this, handler};
|
|
|
|
|
|
|
|
|
|
|
|
assert(msg.M.size() == 1);
|
|
|
|
assert(msg.M.size() == 1);
|
|
|
|
auto dhtMsg = dynamic_cast<FindRouterMessage*>(msg.M[0].get());
|
|
|
|
auto dhtMsg = dynamic_cast<FindRouterMessage*>(msg.M[0].get());
|
|
|
|
@ -1011,7 +1021,7 @@ namespace llarp
|
|
|
|
|
|
|
|
|
|
|
|
m_router->NotifyRouterEvent<tooling::FindRouterSentEvent>(m_router->pubkey(), *dhtMsg);
|
|
|
|
m_router->NotifyRouterEvent<tooling::FindRouterSentEvent>(m_router->pubkey(), *dhtMsg);
|
|
|
|
|
|
|
|
|
|
|
|
routers.emplace(router, RouterLookupJob(this, handler));
|
|
|
|
routers.emplace(router, std::move(job));
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -1164,6 +1174,9 @@ namespace llarp
|
|
|
|
Endpoint::SendAuthResult(
|
|
|
|
Endpoint::SendAuthResult(
|
|
|
|
path::Path_ptr path, PathID_t replyPath, ConvoTag tag, AuthResult result)
|
|
|
|
path::Path_ptr path, PathID_t replyPath, ConvoTag tag, AuthResult result)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
// not applicable because we are not an exit or don't have an endpoint auth policy
|
|
|
|
|
|
|
|
if ((not m_state->m_ExitEnabled) or m_AuthPolicy == nullptr)
|
|
|
|
|
|
|
|
return;
|
|
|
|
ProtocolFrame f;
|
|
|
|
ProtocolFrame f;
|
|
|
|
f.R = AuthResultCodeAsInt(result.code);
|
|
|
|
f.R = AuthResultCodeAsInt(result.code);
|
|
|
|
f.T = tag;
|
|
|
|
f.T = tag;
|
|
|
|
@ -1263,6 +1276,7 @@ namespace llarp
|
|
|
|
void
|
|
|
|
void
|
|
|
|
Endpoint::HandlePathDied(path::Path_ptr p)
|
|
|
|
Endpoint::HandlePathDied(path::Path_ptr p)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
m_router->routerProfiling().MarkPathTimeout(p.get());
|
|
|
|
ManualRebuild(1);
|
|
|
|
ManualRebuild(1);
|
|
|
|
RegenAndPublishIntroSet();
|
|
|
|
RegenAndPublishIntroSet();
|
|
|
|
path::Builder::HandlePathDied(p);
|
|
|
|
path::Builder::HandlePathDied(p);
|
|
|
|
@ -1346,13 +1360,8 @@ namespace llarp
|
|
|
|
// add response hook to list for address.
|
|
|
|
// add response hook to list for address.
|
|
|
|
m_state->m_PendingServiceLookups.emplace(remote, hook);
|
|
|
|
m_state->m_PendingServiceLookups.emplace(remote, hook);
|
|
|
|
|
|
|
|
|
|
|
|
auto& lookupTimes = m_state->m_LastServiceLookupTimes;
|
|
|
|
/// check replay filter
|
|
|
|
const auto now = Now();
|
|
|
|
if (not m_IntrosetLookupFilter.Insert(remote))
|
|
|
|
|
|
|
|
|
|
|
|
// if most recent lookup was within last INTROSET_LOOKUP_RETRY_COOLDOWN
|
|
|
|
|
|
|
|
// just add callback to the list and return
|
|
|
|
|
|
|
|
if (lookupTimes.find(remote) != lookupTimes.end()
|
|
|
|
|
|
|
|
&& now < (lookupTimes[remote] + INTROSET_LOOKUP_RETRY_COOLDOWN))
|
|
|
|
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
|
|
const auto paths = GetManyPathsWithUniqueEndpoints(this, NumParallelLookups);
|
|
|
|
const auto paths = GetManyPathsWithUniqueEndpoints(this, NumParallelLookups);
|
|
|
|
@ -1376,6 +1385,7 @@ namespace llarp
|
|
|
|
},
|
|
|
|
},
|
|
|
|
location,
|
|
|
|
location,
|
|
|
|
PubKey{remote.as_array()},
|
|
|
|
PubKey{remote.as_array()},
|
|
|
|
|
|
|
|
path->Endpoint(),
|
|
|
|
order,
|
|
|
|
order,
|
|
|
|
GenTXID(),
|
|
|
|
GenTXID(),
|
|
|
|
timeout);
|
|
|
|
timeout);
|
|
|
|
@ -1391,12 +1401,7 @@ namespace llarp
|
|
|
|
order++;
|
|
|
|
order++;
|
|
|
|
if (job->SendRequestViaPath(path, Router()))
|
|
|
|
if (job->SendRequestViaPath(path, Router()))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (not hookAdded)
|
|
|
|
hookAdded = true;
|
|
|
|
{
|
|
|
|
|
|
|
|
// if any of the lookups is successful, set last lookup time
|
|
|
|
|
|
|
|
lookupTimes[remote] = now;
|
|
|
|
|
|
|
|
hookAdded = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
LogError(Name(), " send via path failed for lookup");
|
|
|
|
LogError(Name(), " send via path failed for lookup");
|
|
|
|
@ -1608,8 +1613,8 @@ namespace llarp
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (session.inbound)
|
|
|
|
if (session.inbound)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
auto path = GetPathByRouter(session.intro.router);
|
|
|
|
auto path = GetPathByRouter(session.replyIntro.router);
|
|
|
|
if (path)
|
|
|
|
if (path and path->IsReady())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
const auto rttEstimate = (session.replyIntro.latency + path->intro.latency) * 2;
|
|
|
|
const auto rttEstimate = (session.replyIntro.latency + path->intro.latency) * 2;
|
|
|
|
if (rttEstimate < rtt)
|
|
|
|
if (rttEstimate < rtt)
|
|
|
|
@ -1618,10 +1623,6 @@ namespace llarp
|
|
|
|
rtt = rttEstimate;
|
|
|
|
rtt = rttEstimate;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
LogWarn("no path for inbound session T=", tag);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -1849,7 +1850,7 @@ namespace llarp
|
|
|
|
}
|
|
|
|
}
|
|
|
|
self->m_state->m_PendingTraffic.erase(addr);
|
|
|
|
self->m_state->m_PendingTraffic.erase(addr);
|
|
|
|
},
|
|
|
|
},
|
|
|
|
1500ms);
|
|
|
|
PathAlignmentTimeout());
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
LogDebug("SendOrQueue failed: no inbound/outbound sessions");
|
|
|
|
LogDebug("SendOrQueue failed: no inbound/outbound sessions");
|
|
|
|
|
Jeff
3 years ago
committed by
GitHub