From 3925540517d31d62d1ad89158e2a075c9d539463 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Mon, 16 Nov 2020 12:56:22 -0500
Subject: [PATCH] don't update expired tunnels

---
 libi2pd/TunnelPool.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/libi2pd/TunnelPool.cpp b/libi2pd/TunnelPool.cpp
index a898d69e..87413c3f 100644
--- a/libi2pd/TunnelPool.cpp
+++ b/libi2pd/TunnelPool.cpp
@@ -292,8 +292,6 @@ namespace tunnel
 		}
 
 		// new tests
-		std::unique_lock<std::mutex> l1(m_OutboundTunnelsMutex);
-		std::unique_lock<std::mutex> l2(m_InboundTunnelsMutex);
 		auto it1 = m_OutboundTunnels.begin ();
 		auto it2 = m_InboundTunnels.begin ();
 		while (it1 != m_OutboundTunnels.end () && it2 != m_InboundTunnels.end ())
@@ -363,17 +361,24 @@ namespace tunnel
 		}
 		if (found)
 		{
-			// restore from test failed state if any
-			if (test.first->GetState () == eTunnelStateTestFailed)
-				test.first->SetState (eTunnelStateEstablished);
-			if (test.second->GetState () == eTunnelStateTestFailed)
-				test.second->SetState (eTunnelStateEstablished);
 			uint64_t dlt = i2p::util::GetMillisecondsSinceEpoch () - timestamp;
 			LogPrint (eLogDebug, "Tunnels: test of ", msgID, " successful. ", dlt, " milliseconds");
-			// update latency
 			uint64_t latency = dlt / 2;
-			test.first->AddLatencySample(latency);
-			test.second->AddLatencySample(latency);
+			// restore from test failed state if any
+			if (test.first)
+			{	
+				if (test.first->GetState () == eTunnelStateTestFailed)
+					test.first->SetState (eTunnelStateEstablished);
+				// update latency
+				test.first->AddLatencySample(latency);
+			}	
+			if (test.second)
+			{	
+				if (test.second->GetState () == eTunnelStateTestFailed)
+					test.second->SetState (eTunnelStateEstablished);
+				// update latency
+				test.second->AddLatencySample(latency);
+			}	
 		}
 		else
 		{