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

ensure_config split router/client refactor, move C++ stuff to .hpp

Browse Source
pull/19/head
Ryan Tharp 6 years ago
parent 058ed4d4ea
commit e890ef2e5b
3 changed files with 262 additions and 115 deletions
Show Stats Download Patch File Download Diff File

10
include/llarp/config.h
Unescape Escape View File

@ -42,16 +42,6 @@ extern "C"
llarp_config_iter(struct llarp_config *conf,
struct llarp_config_iterator *iter);
/// ensure configuration exists
/// populate with defaults
/// return if this succeeded
/// if overwrite is true then overwrite old config file
/// if basedir is not nullptr then use basedir as an absolute
/// base path for all files in config
bool
llarp_ensure_config(const char *fname, const char *basedir = nullptr,
bool overwrite = false);
#ifdef __cplusplus
}
#endif

250
llarp/config.cpp
Unescape Escape View File

@ -35,6 +35,9 @@ namespace llarp
iwp_links = find_section(top, "bind", section_t{});
services = find_section(top, "services", section_t{});
system = find_section(top, "system", section_t{});
// std::ofstream ft("config_test.ini");
// parser.dump(ft);
parser.write("config_test.ini");
return true;
}
return false;
@ -42,90 +45,71 @@ namespace llarp
} // namespace llarp
extern "C"
bool
llarp_ensure_config(const char *fname, const char *basedir, bool overwrite, bool asRouter)
{
void
llarp_new_config(struct llarp_config **conf)
std::error_code ec;
if(fs::exists(fname, ec) && !overwrite)
{
llarp_config *c = new llarp_config();
*conf = c;
llarp::LogError(fname, " currently exists, please use -f to overwrite");
return true;
}
void
llarp_free_config(struct llarp_config **conf)
if(ec)
{
if(*conf)
delete *conf;
*conf = nullptr;
llarp::LogError(ec);
return false;
}
int
llarp_load_config(struct llarp_config *conf, const char *fname)
std::string basepath = "";
if(basedir)
{
if(!conf->impl.Load(fname))
return -1;
return 0;
basepath = basedir;
basepath += "/";
}
void
llarp_config_iter(struct llarp_config *conf,
struct llarp_config_iterator *iter)
// abort if client.ini already exists
if (!asRouter)
{
iter->conf = conf;
std::map< std::string, llarp::Config::section_t & > sections = {
{"network", conf->impl.network}, {"connect", conf->impl.connect},
{"system", conf->impl.system}, {"bind", conf->impl.iwp_links},
{"netdb", conf->impl.netdb}, {"dns", conf->impl.dns},
{"services", conf->impl.services}};
for(const auto item : conf->impl.router)
iter->visit(iter, "router", item.first.c_str(), item.second.c_str());
for(const auto section : sections)
for(const auto item : section.second)
iter->visit(iter, section.first.c_str(), item.first.c_str(),
item.second.c_str());
}
bool
llarp_ensure_config(const char *fname, const char *basedir, bool overwrite)
if(fs::exists(basepath+"client.ini", ec) && !overwrite)
{
std::error_code ec;
if(fs::exists(fname, ec) && !overwrite)
llarp::LogError(basepath, "client.ini currently exists, please use -f to overwrite");
return true;
}
if(ec)
{
llarp::LogError(ec);
return false;
}
std::string basepath = "";
if(basedir)
{
basepath = basedir;
basepath += "/";
}
// write fname ini
std::ofstream f(fname);
if(!f.is_open())
{
llarp::LogError("failed to open ", fname, " for writing");
return false;
}
llarp_generic_ensure_config(f, basepath);
if (asRouter)
{
llarp_ensure_router_config(f);
}
else
{
llarp_ensure_client_config(f, basepath);
}
llarp::LogInfo("Generated new config ", fname);
return true;
}
void
llarp_generic_ensure_config(std::ofstream &f, std::string basepath)
{
f << "# this configuration was auto generated with 'sane' defaults"
<< std::endl;
f << "# change these values as desired" << std::endl;
f << std::endl << std::endl;
f << "# router settings block" << std::endl;
f << "[router]" << std::endl;
f << "# uncomment these to manually set public address and port"
<< std::endl;
f << "# this is required on providers like AWS because of their firewall "
"rules"
<< std::endl;
f << "# public-address=your.ip.goes.here" << std::endl;
f << "# public-port=1090" << std::endl;
f << std::endl;
f << "# number of crypto worker threads " << std::endl;
f << "threads=4" << std::endl;
f << "# path to store signed RC" << std::endl;
@ -176,7 +160,23 @@ extern "C"
f << "bootstrap=" << basepath << "bootstrap.signed" << std::endl;
f << std::endl << std::endl;
f << "# publish network interfaces for handling inbound traffic"
}
void
llarp_ensure_router_config(std::ofstream &f)
{
f << "# ROUTERS ONLY: router settings block" << std::endl;
f << "[router]" << std::endl;
f << "# uncomment these to manually set public address and port"
<< std::endl;
f << "# this is required on providers like AWS because of their firewall "
"rules"
<< std::endl;
f << "# public-address=your.ip.goes.here" << std::endl;
f << "# public-port=1090" << std::endl;
f << std::endl;
f << "# ROUTERS ONLY: publish network interfaces for handling inbound traffic"
<< std::endl;
f << "[bind]" << std::endl;
@ -189,7 +189,145 @@ extern "C"
<< "# eth0=1090" << std::endl;
f << std::endl;
llarp::LogInfo("Generated new config ", fname);
}
bool
llarp_ensure_client_config(std::ofstream &f, std::string basepath)
{
f << "# ROUTERS ONLY: router settings block" << std::endl;
f << "[router]" << std::endl;
f << "# uncomment these to manually set public address and port"
<< std::endl;
f << "# this is required on providers like AWS because of their firewall "
"rules"
<< std::endl;
f << "# public-address=your.ip.goes.here" << std::endl;
f << "# public-port=1090" << std::endl;
f << std::endl;
f << "# ROUTERS ONLY: publish network interfaces for handling inbound traffic"
<< std::endl;
f << "[bind]" << std::endl;
std::string ifname;
if(llarp::GetBestNetIF(ifname, AF_INET))
f << "# " << ifname << "=1090" << std::endl;
else
f << "# could not autodetect network interface" << std::endl
<< "# eth0=1090" << std::endl;
f << std::endl;
f << "[services]" << std::endl;
f << "client=" << basepath << "client.ini" << std::endl;
f << std::endl;
// done with fname.ini
// start client.ini
// write fname ini
std::ofstream clientini_f(basepath + "client.ini");
if(!f.is_open())
{
llarp::LogError("failed to open ", basepath, "client.ini for writing");
return false;
}
clientini_f << "[client-hidden-service-name]" << std::endl;
clientini_f << "keyfile=client-keyfile.private" << std::endl;
// pick ip
struct privatesInUse ifsInUse = llarp_getPrivateIfs();
std::string ip = "";
if (!ifsInUse.ten)
{
ip = "10.10.0.1/24";
}
else
if (!ifsInUse.oneSeven)
{
ip = "172.16.10.1/24";
}
else
if (!ifsInUse.oneNine)
{
ip = "192.168.10.1/24";
}
else
{
llarp::LogError("Couldn't easily detect a private range to map lokinet onto");
return false;
}
llarp::LogDebug("Detected "+ip+" is available for use, configuring as such");
clientini_f << "ifaddr=" << ip << std::endl;
// pick interface name
uint8_t num = 0;
while(num < 255)
{
std::string iftestname = "lokitun" + std::to_string(num);
struct sockaddr addr;
bool found = llarp_getifaddr(iftestname.c_str(), AF_INET, &addr);
if (!found)
{
llarp::LogDebug("Detected "+iftestname+" is available for use, configuring as such");
break;
}
num ++;
}
if (num == 255)
{
llarp::LogError("Could not find any free lokitun interface names");
return false;
}
clientini_f << "ifname=lokinum" << std::to_string(num) << std::endl;
// prefetch-tags=test
// enable netns?
llarp::LogInfo("Generated hidden service client as " + basepath + "client.ini");
return true;
}
extern "C"
{
void
llarp_new_config(struct llarp_config **conf)
{
llarp_config *c = new llarp_config();
*conf = c;
}
void
llarp_free_config(struct llarp_config **conf)
{
if(*conf)
delete *conf;
*conf = nullptr;
}
int
llarp_load_config(struct llarp_config *conf, const char *fname)
{
if(!conf->impl.Load(fname))
return -1;
return 0;
}
void
llarp_config_iter(struct llarp_config *conf,
struct llarp_config_iterator *iter)
{
iter->conf = conf;
std::map< std::string, llarp::Config::section_t & > sections = {
{"network", conf->impl.network}, {"connect", conf->impl.connect},
{"system", conf->impl.system}, {"bind", conf->impl.iwp_links},
{"netdb", conf->impl.netdb}, {"dns", conf->impl.dns},
{"services", conf->impl.services}};
for(const auto item : conf->impl.router)
iter->visit(iter, "router", item.first.c_str(), item.second.c_str());
for(const auto section : sections)
for(const auto item : section.second)
iter->visit(iter, section.first.c_str(), item.first.c_str(),
item.second.c_str());
}
}

19
llarp/config.hpp
Unescape Escape View File

@ -31,4 +31,23 @@ struct llarp_config
llarp::Config impl;
};
/// ensure configuration exists
/// populate with defaults
/// return if this succeeded
/// if overwrite is true then overwrite old config file
/// if basedir is not nullptr then use basedir as an absolute
/// base path for all files in config
bool
llarp_ensure_config(const char *fname, const char *basedir = nullptr,
bool overwrite = false, bool asRouter = true);
void
llarp_generic_ensure_config(std::ofstream &f, std::string basepath);
void
llarp_ensure_router_config(std::ofstream &f);
bool
llarp_ensure_client_config(std::ofstream &f, std::string basepath);
#endif

Write Preview
Loading…
Cancel
Save