From 32644ddada8b0ddb2e9dccb70a82cee3e33fc81f Mon Sep 17 00:00:00 2001
From: Jeff Becker <ampernand@gmail.com>
Date: Mon, 27 Jun 2016 14:16:29 -0400
Subject: [PATCH] try fixing duplicate Routers In tunnel path

---
 TunnelPool.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/TunnelPool.cpp b/TunnelPool.cpp
index 02adf8a1..87c02682 100644
--- a/TunnelPool.cpp
+++ b/TunnelPool.cpp
@@ -322,7 +322,7 @@ namespace tunnel
 			i2p::data::netdb.GetHighBandwidthRandomRouter (prevHop);
 
 		if (!hop || hop->GetProfile ()->IsBad ())
-			hop = i2p::data::netdb.GetRandomRouter ();
+			hop = i2p::data::netdb.GetRandomRouter (prevHop);
 		return hop;	
 	}	
 
@@ -331,7 +331,6 @@ namespace tunnel
 		if (m_ExplicitPeers) return SelectExplicitPeers (peers, isInbound);
 		auto prevHop = i2p::context.GetSharedRouterInfo ();	
 		int numHops = isInbound ? m_NumInboundHops : m_NumOutboundHops;
-#ifndef MESHNET
 		if (i2p::transport::transports.GetNumPeers () > 25)
 		{
 			auto r = i2p::transport::transports.GetRandomPeer ();
@@ -342,7 +341,6 @@ namespace tunnel
 				numHops--;
 			}
 		}
-#endif
 		for (int i = 0; i < numHops; i++)
 		{
 			auto hop = SelectNextHop (prevHop);