Merge branch 'PurpleI2P:openssl' into fix_html

This commit is contained in:
LLE8
2026-01-15 12:28:21 +03:00
committed by GitHub
2 changed files with 7 additions and 4 deletions
+2 -2
View File
@@ -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;
+5 -2
View File
@@ -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 ())