From 49c1e477369cc08a94ea6eb57d19b4e91f81fc42 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Wed, 8 Apr 2020 18:02:12 -0400
Subject: [PATCH] correct termination if session already exists

---
 libi2pd/NTCP2.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/libi2pd/NTCP2.cpp b/libi2pd/NTCP2.cpp
index 3dfd6250..a92c77ce 100644
--- a/libi2pd/NTCP2.cpp
+++ b/libi2pd/NTCP2.cpp
@@ -706,9 +706,13 @@ namespace transport
 					// ready to communicate
 					auto existing = i2p::data::netdb.FindRouter (ri.GetRouterIdentity ()->GetIdentHash ()); // check if exists already
 					SetRemoteIdentity (existing ? existing->GetRouterIdentity () : ri.GetRouterIdentity ());
-					m_Server.AddNTCP2Session (shared_from_this (), true);
-					Established ();
-					ReceiveLength ();
+					if (m_Server.AddNTCP2Session (shared_from_this (), true))
+					{	
+						Established ();
+						ReceiveLength ();
+					}
+					else
+						Terminate ();
 				}
 				else
 					Terminate ();
@@ -1258,7 +1262,6 @@ namespace transport
 		if (it != m_NTCP2Sessions.end ())
 		{
 			LogPrint (eLogWarning, "NTCP2: session to ", ident.ToBase64 (), " already exists");
-			session->Terminate();
 			return false;
 		}
 		m_NTCP2Sessions.insert (std::make_pair (ident, session));
@@ -1301,6 +1304,8 @@ namespace transport
 					});
 					conn->GetSocket ().async_connect (boost::asio::ip::tcp::endpoint (address, port), std::bind (&NTCP2Server::HandleConnect, this, std::placeholders::_1, conn, timer));
 				}
+				else
+					conn->Terminate ();
 			});
 	}