diff --git a/libi2pd/RouterContext.cpp b/libi2pd/RouterContext.cpp index 25855c15..ca8e165c 100644 --- a/libi2pd/RouterContext.cpp +++ b/libi2pd/RouterContext.cpp @@ -483,16 +483,22 @@ namespace i2p { // create new address m_RouterInfo.AddNTCPAddress (host.to_string ().c_str (), port); - auto mtu = i2p::util::net::GetMTU (host); - if (mtu) + /*bool ssu; i2p::config::GetOption("ssu", ssu); + if (ssu) { - LogPrint (eLogDebug, "Router: Our v6 MTU=", mtu); - if (mtu > 1472) { // TODO: magic constant - mtu = 1472; - LogPrint(eLogWarning, "Router: MTU dropped to upper limit of 1472 bytes"); + auto mtu = i2p::util::net::GetMTU (host); + if (mtu) + { + LogPrint (eLogDebug, "Router: Our v6 MTU=", mtu); + if (mtu > 1472) { // TODO: magic constant + mtu = 1472; + LogPrint(eLogWarning, "Router: MTU dropped to upper limit of 1472 bytes"); + } } - } - m_RouterInfo.AddSSUAddress (host.to_string ().c_str (), port, GetIdentHash (), mtu ? mtu : 1472); // TODO + else + mtu = 1472; + m_RouterInfo.AddSSUAddress (host.to_string ().c_str (), port, GetIdentHash (), mtu); + }*/ updated = true; } if (updated) @@ -526,7 +532,7 @@ namespace i2p if (!found && port) // we have found NTCP2 v4 but not v6 { m_RouterInfo.AddNTCP2Address (m_NTCP2Keys->staticPublicKey, m_NTCP2Keys->iv, host, port); - bool ntcp; i2p::config::GetOption("ntcp", ntcp); + /*bool ntcp; i2p::config::GetOption("ntcp", ntcp); bool ssu; i2p::config::GetOption("ssu", ssu); if (!ntcp && ssu) { @@ -544,7 +550,7 @@ namespace i2p else mtu = 1472; m_RouterInfo.AddSSUAddress (host.to_string ().c_str (), port, GetIdentHash (), mtu); - } + }*/ updated = true; } if (updated) diff --git a/libi2pd/RouterInfo.cpp b/libi2pd/RouterInfo.cpp index a178ea67..c5b92c44 100644 --- a/libi2pd/RouterInfo.cpp +++ b/libi2pd/RouterInfo.cpp @@ -212,7 +212,8 @@ namespace data if (!ecode) { #if BOOST_VERSION >= 104900 - if (!hostaddr.is_unspecified () && ((i2p::context.GetNetID () != I2PD_NET_ID) || !i2p::util::net::IsInReservedRange(hostaddr))) + //if (!hostaddr.is_unspecified () && ((i2p::context.GetNetID () != I2PD_NET_ID) || !i2p::util::net::IsInReservedRange(hostaddr))) + if (!hostaddr.is_unspecified ()) #else hostaddr.to_string (ecode); if (!ecode && ((i2p::context.GetNetID () != I2PD_NET_ID) || !i2p::util::net::IsInReservedRange(hostaddr))) diff --git a/libi2pd/Transports.cpp b/libi2pd/Transports.cpp index 13fa8c51..19701bfa 100644 --- a/libi2pd/Transports.cpp +++ b/libi2pd/Transports.cpp @@ -208,6 +208,7 @@ namespace transport auto& addresses = context.GetRouterInfo ().GetAddresses (); for (const auto& address : addresses) { + LogPrint (eLogInfo, "Transports: Iteration through address ", address->host.to_string() ,":", address->port); if (!address) continue; if (m_NTCPServer == nullptr && enableNTCP) { @@ -227,9 +228,9 @@ namespace transport { if (m_SSUServer == nullptr && enableSSU) { - m_SSUServer = new SSUServer (address->port); - LogPrint (eLogInfo, "Transports: Start listening UDP port ", address->port); try { + m_SSUServer = new SSUServer (address->port); + LogPrint (eLogInfo, "Transports: Start listening UDP port ", address->port); m_SSUServer->Start (); } catch ( std::exception & ex ) { LogPrint(eLogError, "Transports: Failed to bind to UDP port", address->port);