Merge branch 'master' into meshnet

Destination.cpp

@@ -31,7 +31,7 @@ namespace client
 			{
 
 				int len = i2p::util::lexical_cast<int>(it->second, inboundTunnelLen);
-				if (len > 0)
+				if (len >= 0)
 				{
 						inboundTunnelLen = len;
 				}
@@ -42,7 +42,7 @@ namespace client
 			{
 
 				int len = i2p::util::lexical_cast<int>(it->second, outboundTunnelLen);
-				if (len > 0)
+				if (len >= 0)
 				{
 						outboundTunnelLen = len;
 				}

HTTP.cpp

@@ -85,7 +85,8 @@ namespace http {
       }
       /* user[:pass] */
       pos_c = url.find('@', pos_p);
-      if (pos_c != std::string::npos) {
+      std::size_t pos_slash = url.find('/', pos_p);
+      if (pos_c != std::string::npos && (pos_slash == std::string::npos || pos_slash > pos_c)) {
         std::size_t delim = url.find(':', pos_p);
         if (delim != std::string::npos && delim < pos_c) {
           user = url.substr(pos_p, delim - pos_p);
@@ -94,7 +95,7 @@ namespace http {
         } else {
           user = url.substr(pos_p, pos_c - pos_p);
         }
-        pos_p = pos_c + 1;
+        pos_p = pos_c + 1;        
       }
       /* hostname[:port][/path] */
       pos_c = url.find_first_of(":/", pos_p);

Tunnel.cpp

@@ -217,6 +217,7 @@ namespace tunnel
 		if (msg)
 		{	
 			m_NumReceivedBytes += msg->GetLength ();
+			msg->from = shared_from_this ();
 			HandleI2NPMessage (msg);
 		}	
 	}	

TunnelPool.cpp

@@ -387,8 +387,15 @@ namespace tunnel
 		std::vector<std::shared_ptr<const i2p::data::IdentityEx> > peers;
 		if (SelectPeers (peers, true))
 		{
-			std::reverse (peers.begin (), peers.end ());	
+			std::shared_ptr<TunnelConfig> config;
-			auto tunnel = tunnels.CreateInboundTunnel (std::make_shared<TunnelConfig> (peers), outboundTunnel);
+			if (m_NumInboundHops > 0)
+			{	
+				std::reverse (peers.begin (), peers.end ());	
+				config = std::make_shared<TunnelConfig> (peers);
+			}	
+			else
+				config = std::make_shared<ZeroHopsTunnelConfig> ();
+			auto tunnel = tunnels.CreateInboundTunnel (config, outboundTunnel);
 			tunnel->SetTunnelPool (shared_from_this ());
 			if (tunnel->IsEstablished ()) // zero hops
 				TunnelCreated (tunnel);
@@ -403,7 +410,9 @@ namespace tunnel
 		if (!outboundTunnel)
 			outboundTunnel = tunnels.GetNextOutboundTunnel ();
 		LogPrint (eLogDebug, "Tunnels: Re-creating destination inbound tunnel...");
-		auto newTunnel = tunnels.CreateInboundTunnel (std::make_shared<TunnelConfig>(tunnel->GetPeers ()), outboundTunnel);
+		std::shared_ptr<TunnelConfig> config = m_NumInboundHops > 0 ? 
+			std::make_shared<TunnelConfig>(tunnel->GetPeers ()) : std::make_shared<ZeroHopsTunnelConfig> ();
+		auto newTunnel = tunnels.CreateInboundTunnel (config, outboundTunnel);
 		newTunnel->SetTunnelPool (shared_from_this());
 		if (newTunnel->IsEstablished ()) // zero hops
 			TunnelCreated (newTunnel);
@@ -420,8 +429,11 @@ namespace tunnel
 			std::vector<std::shared_ptr<const i2p::data::IdentityEx> > peers;
 			if (SelectPeers (peers, false))
 			{	
-				auto tunnel = tunnels.CreateOutboundTunnel (
+				std::shared_ptr<TunnelConfig> config = m_NumOutboundHops > 0 ? 
-					std::make_shared<TunnelConfig> (peers, inboundTunnel->GetNextTunnelID (), inboundTunnel->GetNextIdentHash ()));
+					std::make_shared<TunnelConfig>(peers, inboundTunnel->GetNextTunnelID (), inboundTunnel->GetNextIdentHash ()) : 
+					std::make_shared<ZeroHopsTunnelConfig> ();
+
+				auto tunnel = tunnels.CreateOutboundTunnel (config);
 				tunnel->SetTunnelPool (shared_from_this ());
 				if (tunnel->IsEstablished ()) // zero hops
 					TunnelCreated (tunnel);
@@ -441,9 +453,10 @@ namespace tunnel
 		if (inboundTunnel)
 		{	
 			LogPrint (eLogDebug, "Tunnels: Re-creating destination outbound tunnel...");
-			auto newTunnel = tunnels.CreateOutboundTunnel (
+			std::shared_ptr<TunnelConfig> config = m_NumOutboundHops > 0 ? 
-				std::make_shared<TunnelConfig> (tunnel->GetPeers (),
+					std::make_shared<TunnelConfig>(tunnel->GetPeers (), inboundTunnel->GetNextTunnelID (), inboundTunnel->GetNextIdentHash ()) : 
-					inboundTunnel->GetNextTunnelID (), inboundTunnel->GetNextIdentHash ()));
+					std::make_shared<ZeroHopsTunnelConfig> ();
+			auto newTunnel = tunnels.CreateOutboundTunnel (config);
 			newTunnel->SetTunnelPool (shared_from_this ());
 			if (newTunnel->IsEstablished ()) // zero hops
 				TunnelCreated (newTunnel);