create tunnel through any type of transports

RouterInfo.cpp

@@ -180,6 +180,9 @@ namespace data
 		CryptoPP::SHA256().CalculateDigest(m_IdentHash, (uint8_t *)&m_RouterIdentity, sizeof (m_RouterIdentity));
 		UpdateIdentHashBase64 ();
 		UpdateRoutingKey ();
+
+		if (!m_SupportedTransports)
+			SetUnreachable (true);
 	}	
 
 	void RouterInfo::UpdateIdentHashBase64 ()

Tunnel.cpp

@@ -389,7 +389,7 @@ namespace tunnel
 				CreateTunnel<OutboundTunnel> (
 				  	new TunnelConfig (std::vector<const i2p::data::RouterInfo *> 
 					    { 
-							i2p::data::netdb.GetRandomNTCPRouter ()
+							i2p::data::netdb.GetRandomRouter ()
 						},		
 			     		inboundTunnel->GetTunnelConfig ()));
 			}	
@@ -397,7 +397,7 @@ namespace tunnel
 			{
 
 				LogPrint ("Creating two hops outbound tunnel...");
-				auto firstHop = i2p::data::netdb.GetRandomNTCPRouter (); // first hop must be NTCP
+				auto firstHop = i2p::data::netdb.GetRandomRouter (); 
 				CreateTunnel<OutboundTunnel> (
 				  	new TunnelConfig (std::vector<const i2p::data::RouterInfo *>
 				    	{
@@ -439,7 +439,7 @@ namespace tunnel
 				CreateTunnel<InboundTunnel> (
 					new TunnelConfig (std::vector<const i2p::data::RouterInfo *>
 					    {              
-							i2p::data::netdb.GetRandomNTCPRouter ()
+							i2p::data::netdb.GetRandomRouter ()
 						}));
 			}
 			else
@@ -447,11 +447,12 @@ namespace tunnel
 				OutboundTunnel * outboundTunnel = GetNextOutboundTunnel ();
 				LogPrint ("Creating two hops inbound tunnel...");
 				auto router = outboundTunnel->GetTunnelConfig ()->GetFirstHop ()->router;
+				auto firstHop = i2p::data::netdb.GetRandomRouter (outboundTunnel->GetEndpointRouter ()); 
 				CreateTunnel<InboundTunnel> (
 					new TunnelConfig (std::vector<const i2p::data::RouterInfo *>
 						{                
-				            i2p::data::netdb.GetRandomRouter (outboundTunnel->GetEndpointRouter ()), 
+				            firstHop, 
-							router != &i2p::context.GetRouterInfo () ? router : i2p::data::netdb.GetRandomNTCPRouter () // last hop must be NTCP
+							router != &i2p::context.GetRouterInfo () ? router : i2p::data::netdb.GetRandomRouter (firstHop) 
 		                }),                 
 				    outboundTunnel);
 			}