PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 08:14:15 +00:00
Code Issues Releases Activity

try both ipv4 and ipv6 SSU addresses if presented

Browse Source
This commit is contained in:
orignal 2021-02-04 21:48:13 -05:00
parent 89e8d99294
commit dc64d1738a
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libi2pd/Transports.cpp
View File

@ -437,20 +437,41 @@ namespace transport
else else
peer.numAttempts = 2; // switch to SSU peer.numAttempts = 2; // switch to SSU
} }
if (peer.numAttempts == 2)// SSU if (peer.numAttempts == 2 || peer.numAttempts == 3) // SSU
{ {
peer.numAttempts++; if (m_SSUServer)
if (m_SSUServer && peer.router->IsSSU (!context.SupportsV6 ())) {
{ std::shared_ptr<const RouterInfo::Address> address;
auto address = peer.router->GetSSUAddress (!context.SupportsV6 ()); if (peer.numAttempts == 2) // SSU ipv6
if (address && (!m_CheckReserved || !i2p::util::net::IsInReservedRange(address->host))) {
if (context.GetRouterInfo ().IsSSUV6 () && peer.router->IsSSUV6 ())
{
address = peer.router->GetSSUV6Address ();
if (address && m_CheckReserved && i2p::util::net::IsInReservedRange(address->host))
address = nullptr;
}
peer.numAttempts++;
}
if (!address && peer.numAttempts == 3) // SSU ipv4
{
if (context.GetRouterInfo ().IsSSU (true) && peer.router->IsSSU (true))
{
address = peer.router->GetSSUAddress (true);
if (address && m_CheckReserved && i2p::util::net::IsInReservedRange(address->host))
address = nullptr;
}
peer.numAttempts++;
}
if (address)
{ {
m_SSUServer->CreateSession (peer.router, address->host, address->port); m_SSUServer->CreateSession (peer.router, address->host, address->port);
return true; return true;
} }
} }
else
peer.numAttempts += 2; // switch to Mesh
} }
if (peer.numAttempts == 3) // Mesh if (peer.numAttempts == 4) // Mesh
{ {
peer.numAttempts++; peer.numAttempts++;
if (m_NTCP2Server && context.GetRouterInfo ().IsMesh () && peer.router->IsMesh ()) if (m_NTCP2Server && context.GetRouterInfo ().IsMesh () && peer.router->IsMesh ())
@ -464,7 +485,7 @@ namespace transport
} }
} }
} }
LogPrint (eLogInfo, "Transports: No NTCP or SSU addresses available"); LogPrint (eLogInfo, "Transports: No compatble NTCP2 or SSU addresses available");
i2p::data::netdb.SetUnreachable (ident, true); // we are here because all connection attempts failed i2p::data::netdb.SetUnreachable (ident, true); // we are here because all connection attempts failed
peer.Done (); peer.Done ();
std::unique_lock<std::mutex> l(m_PeersMutex); std::unique_lock<std::mutex> l(m_PeersMutex);