update all SSU2 addresses

libi2pd/RouterContext.cpp

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