From 07e14ddda8dea1562b5eeab28039fa2cfcd3c39a Mon Sep 17 00:00:00 2001 From: orignal Date: Mon, 4 Apr 2022 20:37:29 -0400 Subject: [PATCH] check if SSU2 enabled --- libi2pd/RouterContext.cpp | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/libi2pd/RouterContext.cpp b/libi2pd/RouterContext.cpp index af92e86c..588d5c23 100644 --- a/libi2pd/RouterContext.cpp +++ b/libi2pd/RouterContext.cpp @@ -672,14 +672,17 @@ namespace i2p if (!foundSSU2) { bool ssu2; i2p::config::GetOption("ssu2.enabled", ssu2); - bool ssu2Published; i2p::config::GetOption("ssu2.published", ssu2Published); - if (ssu2Published) - { - uint16_t ssu2Port; i2p::config::GetOption ("ssu2.port", ssu2Port); - m_RouterInfo.AddSSU2Address (m_SSU2Keys->staticPublicKey, m_SSU2Keys->intro, boost::asio::ip::address::from_string ("::1"), ssu2Port); + if (ssu2) + { + bool ssu2Published; i2p::config::GetOption("ssu2.published", ssu2Published); + if (ssu2Published) + { + uint16_t ssu2Port; i2p::config::GetOption ("ssu2.port", ssu2Port); + m_RouterInfo.AddSSU2Address (m_SSU2Keys->staticPublicKey, m_SSU2Keys->intro, boost::asio::ip::address::from_string ("::1"), ssu2Port); + } + else + m_RouterInfo.AddSSU2Address (m_SSU2Keys->staticPublicKey, m_SSU2Keys->intro, i2p::data::RouterInfo::eV6); } - else - m_RouterInfo.AddSSU2Address (m_SSU2Keys->staticPublicKey, m_SSU2Keys->intro, i2p::data::RouterInfo::eV6); } m_RouterInfo.EnableV6 (); } @@ -749,14 +752,17 @@ namespace i2p if (!foundSSU2) { bool ssu2; i2p::config::GetOption("ssu2.enabled", ssu2); - bool ssu2Published; i2p::config::GetOption("ssu2.published", ssu2Published); - if (ssu2Published) + if (ssu2) { - uint16_t ssu2Port; i2p::config::GetOption ("ssu2.port", ssu2Port); - m_RouterInfo.AddSSU2Address (m_SSU2Keys->staticPublicKey, m_SSU2Keys->intro, boost::asio::ip::address::from_string ("127.0.0.1"), ssu2Port); + bool ssu2Published; i2p::config::GetOption("ssu2.published", ssu2Published); + if (ssu2Published) + { + uint16_t ssu2Port; i2p::config::GetOption ("ssu2.port", ssu2Port); + m_RouterInfo.AddSSU2Address (m_SSU2Keys->staticPublicKey, m_SSU2Keys->intro, boost::asio::ip::address::from_string ("127.0.0.1"), ssu2Port); + } + else + m_RouterInfo.AddSSU2Address (m_SSU2Keys->staticPublicKey, m_SSU2Keys->intro, i2p::data::RouterInfo::eV6); } - else - m_RouterInfo.AddSSU2Address (m_SSU2Keys->staticPublicKey, m_SSU2Keys->intro, i2p::data::RouterInfo::eV6); } m_RouterInfo.EnableV4 (); }