add upstream dns to default hidden service

pull/47/head
Jeff Becker 6 years ago
parent fb0e6c3d9c
commit a83e21c464
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05

@ -72,7 +72,9 @@ namespace llarp
llarp::Addr &localPrivateIpAddr);
bool
AddDefaultEndpoint(const std::string &ifaddr, const std::string &ifname);
AddDefaultEndpoint(const std::string &ifaddr, const std::string &ifname,
const std::string &remoteResovler,
const std::string &localResolver);
bool
AddEndpoint(const Config::section_t &conf, bool autostart = false);

@ -968,7 +968,14 @@ llarp_router::InitOutboundLink()
bool
llarp_router::CreateDefaultHiddenService()
{
return hiddenServiceContext.AddDefaultEndpoint(defaultIfAddr, defaultIfName);
if(upstreamResolvers.size())
return hiddenServiceContext.AddDefaultEndpoint(defaultIfAddr, defaultIfName,
upstreamResolvers.front(),
resolverBindAddr);
else
return hiddenServiceContext.AddDefaultEndpoint(defaultIfAddr, defaultIfName,
defaultUpstreamResolver,
resolverBindAddr);
}
bool

@ -139,6 +139,8 @@ struct llarp_router
std::unordered_map< llarp::RouterID, llarp_time_t, llarp::RouterID::Hash >
m_PersistingSessions;
// TODO: change me if needed
const std::string defaultUpstreamResolver = "1.1.1.1:53";
std::list< std::string > upstreamResolvers;
std::string resolverBindAddr = "127.0.0.1:53";

@ -209,12 +209,17 @@ namespace llarp
bool
Context::AddDefaultEndpoint(const std::string &ifaddr,
const std::string &ifname)
const std::string &ifname,
const std::string &remoteResolver,
const std::string &localResolver)
{
return AddEndpoint(
{"default",
{{"type", "tun"}, {"ifaddr", ifaddr}, {"ifname", ifname}}},
true);
return AddEndpoint({"default",
{{"type", "tun"},
{"ifaddr", ifaddr},
{"ifname", ifname},
{"local-dns", localResolver},
{"upstream-dns", remoteResolver}}},
true);
}
bool

Loading…
Cancel
Save