Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-03-13 04:46:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Don't change Yddrasil address if router becomes unreachable through ipv6

Browse source
This commit is contained in:
orignal 2021-03-30 19:27:40 -04:00
parent 25eae3c116
commit bd7328345f
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libi2pd/RouterContext.cpp
View file

@ -250,21 +250,30 @@ namespace i2p
bool updated = false; bool updated = false;
for (auto& address : m_RouterInfo.GetAddresses ()) for (auto& address : m_RouterInfo.GetAddresses ())
{ {
if (address->IsNTCP2 () && (address->port != port || address->ntcp2->isPublished != publish) if (address->IsNTCP2 () && (address->port != port || address->ntcp2->isPublished != publish))
&& ((v4 && address->IsV4 ()) || (v6 && address->IsV6 ()) ||
(ygg && i2p::util::net::IsYggdrasilAddress (address->host))))
{ {
if (!port && !address->port) bool isAddr = v4 && address->IsV4 ();
{ if (!isAddr && (v6 || ygg))
// select random port only if address's port is not set {
port = rand () % (30777 - 9111) + 9111; // I2P network ports range if (i2p::util::net::IsYggdrasilAddress (address->host))
if (port == 9150) port = 9151; // Tor browser isAddr = ygg;
else
isAddr = v6 && address->IsV6 ();
} }
if (port) address->port = port; if (isAddr)
address->cost = publish ? i2p::data::COST_NTCP2_PUBLISHED : i2p::data::COST_NTCP2_NON_PUBLISHED; {
address->ntcp2->isPublished = publish; if (!port && !address->port)
address->ntcp2->iv = m_NTCP2Keys->iv; {
updated = true; // select random port only if address's port is not set
port = rand () % (30777 - 9111) + 9111; // I2P network ports range
if (port == 9150) port = 9151; // Tor browser
}
if (port) address->port = port;
address->cost = publish ? i2p::data::COST_NTCP2_PUBLISHED : i2p::data::COST_NTCP2_NON_PUBLISHED;
address->ntcp2->isPublished = publish;
address->ntcp2->iv = m_NTCP2Keys->iv;
updated = true;
}
} }
} }
if (updated) if (updated)