mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2026-05-25 14:15:04 +00:00
Merge branch 'PurpleI2P:openssl' into fix_html
This commit is contained in:
@@ -425,7 +425,7 @@ namespace i2p
|
||||
if (v4)
|
||||
{
|
||||
auto addr = (*addresses)[i2p::data::RouterInfo::eNTCP2V4Idx];
|
||||
if (addr && (addr->port != port || addr->published != publish))
|
||||
if (addr && (addr->port != port || addr->published != publish || addr->v != version))
|
||||
{
|
||||
PublishNTCP2Address (addr, port, publish, version);
|
||||
updated = true;
|
||||
@@ -434,7 +434,7 @@ namespace i2p
|
||||
if (v6)
|
||||
{
|
||||
auto addr = (*addresses)[i2p::data::RouterInfo::eNTCP2V6Idx];
|
||||
if (addr && (addr->port != port || addr->published != publish))
|
||||
if (addr && (addr->port != port || addr->published != publish || addr->v != version))
|
||||
{
|
||||
PublishNTCP2Address (addr, port, publish, version);
|
||||
updated = true;
|
||||
|
||||
@@ -547,8 +547,11 @@ namespace client
|
||||
if (tunConf.empty ())
|
||||
tunConf = i2p::fs::DataDirPath ("tunnels.conf");
|
||||
|
||||
LogPrint(eLogDebug, "Clients: Tunnels config file: ", tunConf);
|
||||
ReadTunnels (tunConf, numClientTunnels, numServerTunnels);
|
||||
if (i2p::fs::Exists (tunConf))
|
||||
{
|
||||
LogPrint(eLogDebug, "Clients: Tunnels config file: ", tunConf);
|
||||
ReadTunnels (tunConf, numClientTunnels, numServerTunnels);
|
||||
}
|
||||
|
||||
std::string tunDir; i2p::config::GetOption("tunnelsdir", tunDir);
|
||||
if (tunDir.empty ())
|
||||
|
||||
Reference in New Issue
Block a user