Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-28 11:47:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

moved tunnel config file inialization to ClientContext

Browse source
This commit is contained in:
orignal 2016-02-22 15:27:40 -05:00
parent 2b4c3b8d1f
commit 6eec353c2b
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ClientContext.cpp
View file

@ -252,14 +252,17 @@ namespace client
void ClientContext::ReadTunnels ()
{
boost::property_tree::ptree pt;
std::string pathTunConf;
i2p::config::GetOption("tunconf", pathTunConf);
if (pathTunConf == "")
return;
try {
boost::property_tree::read_ini (pathTunConf, pt);
} catch (std::exception& ex) {
LogPrint (eLogWarning, "Clients: Can't read ", pathTunConf, ": ", ex.what ());
std::string tunConf; i2p::config::GetOption("tunconf", tunConf);
if (tunConf == "")
tunConf = i2p::fs::DataDirPath ("tunnels.cfg");
LogPrint(eLogDebug, "FS: tunnels config file: ", tunConf);
try
{
boost::property_tree::read_ini (tunConf, pt);
}
catch (std::exception& ex)
{
LogPrint (eLogWarning, "Clients: Can't read ", tunConf, ": ", ex.what ());
return;
}
@ -347,7 +350,7 @@ namespace client
numServerTunnels++;
}
else
LogPrint (eLogWarning, "Clients: Unknown section type=", type, " of ", name, " in ", pathTunConf);
LogPrint (eLogWarning, "Clients: Unknown section type=", type, " of ", name, " in ", tunConf);
}
catch (std::exception& ex)