oxen-io
/
lokinet
mirror of https://github.com/oxen-io/lokinet
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

make loopback testnet work again

This commit is contained in:
Jeff Becker 2018-08-23 10:07:53 -04:00
parent 9ca8d837d7
commit 51029f0f2f
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
2 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/testnet/genconf.py
View File

@ -92,6 +92,7 @@ def main():
f.write('''[test-service]
tag=test
prefetch-tag=test
type=null
''')
with open(args.out, 'w') as f:

54
llarp/service/context.cpp
View File

@ -33,19 +33,58 @@ namespace llarp
bool
Context::AddEndpoint(const Config::section_t &conf)
{
auto itr = m_Endpoints.find(conf.first);
if(itr != m_Endpoints.end())
{
llarp::LogError("cannot add hidden service with duplicate name: ",
conf.first);
return false;
auto itr = m_Endpoints.find(conf.first);
if(itr != m_Endpoints.end())
{
llarp::LogError("cannot add hidden service with duplicate name: ",
conf.first);
return false;
}
}
// extract type
std::string endpointType = "tun";
for(const auto &option : conf.second)
{
if(option.first == "type")
endpointType = option.second;
}
std::unique_ptr< llarp::service::Endpoint > service;
std::unique_ptr< llarp::service::Endpoint > service(
new llarp::handlers::TunEndpoint(conf.first, m_Router));
static std::map< std::string,
std::function< llarp::service::Endpoint *(
const std::string &, llarp_router *) > >
endpointConstructors = {
{"tun",
[](const std::string &nick,
llarp_router *r) -> llarp::service::Endpoint * {
return new llarp::handlers::TunEndpoint(nick, r);
}},
{"null",
[](const std::string &nick,
llarp_router *r) -> llarp::service::Endpoint * {
return new llarp::service::Endpoint(nick, r);
}}};
{
// detect type
auto itr = endpointConstructors.find(endpointType);
if(itr == endpointConstructors.end())
{
llarp::LogError("no such endpoint type: ", endpointType);
return false;
}
// construct
service = std::unique_ptr< llarp::service::Endpoint >(
itr->second(conf.first, m_Router));
}
// configure
for(const auto &option : conf.second)
{
auto &k = option.first;
if(k == "type")
continue;
auto &v = option.second;
if(!service->SetOption(k, v))
{
@ -54,6 +93,7 @@ namespace llarp
return false;
}
}
// start
if(service->Start())
{
llarp::LogInfo("added hidden service endpoint ", service->Name());