Browse Source

update all SSU2 addresses

pull/1861/head
orignal 2 years ago
parent
commit
1f23584c24
  1. 70
      libi2pd/RouterContext.cpp

70
libi2pd/RouterContext.cpp

@ -397,41 +397,59 @@ namespace i2p
{ {
auto addresses = m_RouterInfo.GetAddresses (); auto addresses = m_RouterInfo.GetAddresses ();
if (!addresses) return; if (!addresses) return;
bool found = false, updated = false; bool updated = false;
for (auto& it : *addresses) if (enable)
{ {
if (it && it->IsSSU2 ()) bool ipv4; i2p::config::GetOption("ipv4", ipv4);
bool ipv6; i2p::config::GetOption("ipv6", ipv6);
if (ipv4 && (*addresses)[i2p::data::RouterInfo::eSSU2V4Idx])
{ {
found = true; (*addresses)[i2p::data::RouterInfo::eSSU2V4Idx]->s = m_SSU2Keys->staticPublicKey;
if (enable) (*addresses)[i2p::data::RouterInfo::eSSU2V4Idx]->i = m_SSU2Keys->intro;
ipv4 = false;
}
if (ipv6 && (*addresses)[i2p::data::RouterInfo::eSSU2V6Idx])
{
(*addresses)[i2p::data::RouterInfo::eSSU2V6Idx]->s = m_SSU2Keys->staticPublicKey;
(*addresses)[i2p::data::RouterInfo::eSSU2V6Idx]->i = m_SSU2Keys->intro;
ipv6 = false;
}
if (ipv4 && ipv6)
{
bool published; i2p::config::GetOption("ssu2.published", published);
if (!published)
{ {
it->s = m_SSU2Keys->staticPublicKey; m_RouterInfo.AddSSU2Address (m_SSU2Keys->staticPublicKey, m_SSU2Keys->intro,
it->i = m_SSU2Keys->intro; i2p::data::RouterInfo::AddressCaps::eV4 | i2p::data::RouterInfo::AddressCaps::eV6);
} ipv4 = false; ipv6 = false;
else updated = true;
it.reset (); }
}
if (ipv4)
{
m_RouterInfo.AddSSU2Address (m_SSU2Keys->staticPublicKey, m_SSU2Keys->intro, i2p::data::RouterInfo::AddressCaps::eV4);
updated = true; updated = true;
} }
} if (ipv6)
if (enable && !found) {
m_RouterInfo.AddSSU2Address (m_SSU2Keys->staticPublicKey, m_SSU2Keys->intro, i2p::data::RouterInfo::AddressCaps::eV6);
updated= true;
}
}
else
{ {
bool ipv4; i2p::config::GetOption("ipv4", ipv4); if ((*addresses)[i2p::data::RouterInfo::eSSU2V4Idx])
bool ipv6; i2p::config::GetOption("ipv6", ipv6);
bool published; i2p::config::GetOption("ntcp2.published", published);
if (published)
{ {
if (ipv4) m_RouterInfo.AddSSU2Address (m_SSU2Keys->staticPublicKey, m_SSU2Keys->intro, i2p::data::RouterInfo::AddressCaps::eV4); (*addresses)[i2p::data::RouterInfo::eSSU2V4Idx] = nullptr;
if (ipv6) m_RouterInfo.AddSSU2Address (m_SSU2Keys->staticPublicKey, m_SSU2Keys->intro, i2p::data::RouterInfo::AddressCaps::eV6); updated = true;
} }
else if ((*addresses)[i2p::data::RouterInfo::eSSU2V6Idx])
{ {
uint8_t addressCaps = 0; (*addresses)[i2p::data::RouterInfo::eSSU2V6Idx] = nullptr;
if (ipv4) addressCaps |= i2p::data::RouterInfo::AddressCaps::eV4; updated = true;
if (ipv6) addressCaps |= i2p::data::RouterInfo::AddressCaps::eV6;
m_RouterInfo.AddSSU2Address (m_SSU2Keys->staticPublicKey, m_SSU2Keys->intro, addressCaps);
} }
updated = true; }
}
if (updated) if (updated)
UpdateRouterInfo (); UpdateRouterInfo ();
} }

Loading…
Cancel
Save