make Endpoint::LookupNameAsync return void

pull/1541/head
Jeff Becker 3 years ago
parent 8e57572b37
commit 4e14567d67
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05

@ -483,7 +483,7 @@ namespace llarp
}
else if (service::NameIsValid(lnsName))
{
return LookupNameAsync(lnsName, [msg, lnsName, reply](auto maybe) mutable {
LookupNameAsync(lnsName, [msg, lnsName, reply](auto maybe) mutable {
if (maybe.has_value())
{
msg.AddMXReply(maybe->ToString(), 1);
@ -494,6 +494,7 @@ namespace llarp
}
reply(msg);
});
return true;
}
else
msg.AddNXReply();
@ -617,24 +618,25 @@ namespace llarp
}
else if (service::NameIsValid(lnsName))
{
return LookupNameAsync(
lnsName,
[msg = std::make_shared<dns::Message>(msg),
name = Name(),
lnsName,
isV6,
reply,
ReplyToLokiDNSWhenReady](auto maybe) {
if (not maybe.has_value())
{
LogWarn(name, " lns name ", lnsName, " not resolved");
msg->AddNXReply();
reply(*msg);
return;
}
LogInfo(name, " ", lnsName, " resolved to ", maybe->ToString());
ReplyToLokiDNSWhenReady(*maybe, msg, isV6);
});
LookupNameAsync(
lnsName,
[msg = std::make_shared<dns::Message>(msg),
name = Name(),
lnsName,
isV6,
reply,
ReplyToLokiDNSWhenReady](auto maybe) {
if (not maybe.has_value())
{
LogWarn(name, " lns name ", lnsName, " not resolved");
msg->AddNXReply();
reply(*msg);
return;
}
LogInfo(name, " ", lnsName, " resolved to ", maybe->ToString());
ReplyToLokiDNSWhenReady(*maybe, msg, isV6);
});
return true;
}
else
msg.AddNXReply();

@ -798,7 +798,7 @@ namespace llarp
return not m_ExitMap.Empty();
}
bool
void
Endpoint::LookupNameAsync(std::string name, std::function<void(std::optional<Address>)> handler)
{
auto& cache = m_state->nameCache;
@ -806,7 +806,7 @@ namespace llarp
if (maybe.has_value())
{
handler(maybe);
return true;
return;
}
LogInfo(Name(), " looking up LNS name: ", name);
path::Path::UniqueEndpointSet_t paths;
@ -820,7 +820,7 @@ namespace llarp
if (paths.size() < 3)
{
handler(std::nullopt);
return true;
return;
}
auto maybeInvalidateCache = [handler, &cache, name](auto result) {
@ -844,7 +844,6 @@ namespace llarp
auto job = new LookupNameJob(this, GenTXID(), name, resultHandler);
job->SendRequestViaPath(path, m_router);
}
return true;
}
bool

@ -218,7 +218,7 @@ namespace llarp
bool
LookupRouterAnon(RouterID router, RouterLookupHandler handler);
bool
void
LookupNameAsync(std::string name, std::function<void(std::optional<Address>)> resultHandler);
/// called on event loop pump

Loading…
Cancel
Save