publish and handle SSU addreses without host

libi2pd/RouterInfo.cpp

@@ -545,7 +545,7 @@ namespace data
 				std::string caps;
 				if (address.IsPeerTesting ()) caps += CAPS_FLAG_SSU_TESTING;
 				if (address.IsIntroducer ()) caps += CAPS_FLAG_SSU_INTRODUCER;
-				if (address.ssu && address.ssu->introducers.empty ())
+				if (IsReachable ())
 					isPublished = true;
 				else
 					caps += CAPS_FLAG_V4;

libi2pd/SSU.cpp

@@ -445,7 +445,7 @@ namespace transport
 		if (router && address)
 		{
 			if (router->UsesIntroducer ())
-				m_Service.post (std::bind (&SSUServer::CreateSessionThroughIntroducer, this, router, peerTest)); // always V4 thread
+				m_Service.post (std::bind (&SSUServer::CreateSessionThroughIntroducer, this, router, address, peerTest)); // always V4 thread
 			else
 			{
 				boost::asio::ip::udp::endpoint remoteEndpoint (address->host, address->port);
@@ -477,12 +477,12 @@ namespace transport
 		}
 	}
 
-	void SSUServer::CreateSessionThroughIntroducer (std::shared_ptr<const i2p::data::RouterInfo> router, bool peerTest)
+	void SSUServer::CreateSessionThroughIntroducer (std::shared_ptr<const i2p::data::RouterInfo> router, 
+		std::shared_ptr<const i2p::data::RouterInfo::Address> address, bool peerTest)
 	{
-		if (router && router->UsesIntroducer ())
+		if (router && router->UsesIntroducer () && address)
 		{	
-			auto address = router->GetSSUAddress (true); // v4 only for now
-			if (address)
+			if (!address->host.is_unspecified () && address->port)
 			{	
 				boost::asio::ip::udp::endpoint remoteEndpoint (address->host, address->port);
 				auto it = m_Sessions.find (remoteEndpoint);
@@ -494,6 +494,7 @@ namespace transport
 						session->SendPeerTest ();
 					return;
 				}
+			}	
 			// create new session
 			int numIntroducers = address->ssu->introducers.size ();
 			if (numIntroducers > 0)
@@ -510,7 +511,7 @@ namespace transport
 					if (ep.address ().is_v4 ()) // ipv4 only
 					{
 						if (!introducer) introducer = intr; // we pick first one for now
-							it = m_Sessions.find (ep);
+						auto it = m_Sessions.find (ep);
 						if (it != m_Sessions.end ())
 						{
 							introducerSession = it->second;
@@ -533,11 +534,10 @@ namespace transport
 					introducerSession = std::make_shared<SSUSession> (*this, introducerEndpoint, router);
 					m_Sessions[introducerEndpoint] = introducerSession;
 				}
-#if BOOST_VERSION >= 104900
 				if (!address->host.is_unspecified () && address->port)
-#endif
 				{
 					// create session
+					boost::asio::ip::udp::endpoint remoteEndpoint (address->host, address->port);
 					auto session = std::make_shared<SSUSession> (*this, remoteEndpoint, router, peerTest);
 					m_Sessions[remoteEndpoint] = session;
 
@@ -556,9 +556,6 @@ namespace transport
 			else
 				LogPrint (eLogWarning, "SSU: Can't connect to unreachable router and no introducers present");
 		}
-			else
-				LogPrint (eLogWarning, "SSU: Router ", i2p::data::GetIdentHashAbbreviation (router->GetIdentHash ()), " doesn't have SSU address");
-		}
 	}
 
 	void SSUServer::DeleteSession (std::shared_ptr<SSUSession> session)

libi2pd/SSU.h

@@ -90,7 +90,8 @@ namespace transport
 			void HandleReceivedPackets (std::vector<SSUPacket *> packets,
 				std::map<boost::asio::ip::udp::endpoint, std::shared_ptr<SSUSession> >* sessions);
 
-			void CreateSessionThroughIntroducer (std::shared_ptr<const i2p::data::RouterInfo> router, bool peerTest = false);
+			void CreateSessionThroughIntroducer (std::shared_ptr<const i2p::data::RouterInfo> router, 
+				std::shared_ptr<const i2p::data::RouterInfo::Address> address, bool peerTest = false);
 			template<typename Filter>
 			std::shared_ptr<SSUSession> GetRandomV4Session (Filter filter);
 			template<typename Filter>