From a7406e03abbd84600462d894c0994bad6aa0def5 Mon Sep 17 00:00:00 2001
From: orignal <romakoshelkin@yandex.ru>
Date: Fri, 11 Jul 2014 12:23:29 -0400
Subject: [PATCH] try to find existing SSU session to introducer first

---
 SSU.cpp | 48 ++++++++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/SSU.cpp b/SSU.cpp
index 0d745663..8c2115f8 100644
--- a/SSU.cpp
+++ b/SSU.cpp
@@ -77,7 +77,7 @@ namespace ssu
 		if (m_State == eSessionStateIntroduced)
 		{
 			// HolePunch received
-			LogPrint ("SSU HolePuch of ", len, " bytes received");
+			LogPrint ("SSU HolePunch of ", len, " bytes received");
 			m_State = eSessionStateUnknown;
 			Connect ();
 		}
@@ -151,7 +151,8 @@ namespace ssu
 			}	
 			case PAYLOAD_TYPE_RELAY_RESPONSE:
 				ProcessRelayResponse (buf, len);
-				m_Server.DeleteSession (this);
+				if (m_State != eSessionStateEstablished)
+					m_Server.DeleteSession (this);
 			break;
 			case PAYLOAD_TYPE_RELAY_REQUEST:
 				LogPrint ("SSU relay request received");
@@ -985,30 +986,41 @@ namespace ssu
 					else
 					{
 						// connect through introducer
-						session->WaitForIntroduction ();
-						if (address->introducers.size () > 0)
+						int numIntroducers = address->introducers.size ();
+						if (numIntroducers > 0)
 						{
-							auto& introducer = address->introducers[0]; // TODO:
-							boost::asio::ip::udp::endpoint introducerEndpoint (introducer.iHost, introducer.iPort);
-							LogPrint ("Creating new SSU session to [", router->GetIdentHashAbbreviation (), 
-									"] through introducer ", introducerEndpoint.address ().to_string (), ":", introducerEndpoint.port ());
-							it = m_Sessions.find (introducerEndpoint);
 							SSUSession * introducerSession = nullptr;
-							if (it != m_Sessions.end ())
+							const i2p::data::RouterInfo::Introducer * introducer = nullptr;
+							// we might have a session to introducer already
+							for (int i = 0; i < numIntroducers; i++)
 							{
+								introducer = &(address->introducers[i]);
+								it = m_Sessions.find (boost::asio::ip::udp::endpoint (introducer->iHost, introducer->iPort));
+								if (it != m_Sessions.end ())
+								{
+									introducerSession = it->second;
+									break; 
+								}	
+							}
+
+							if (introducerSession) // session found 
 								LogPrint ("Session to introducer already exists");
-								introducerSession = it->second; 
-							}	
-							else
+							else // create new
 							{
-								LogPrint ("New session to introducer created");
+								LogPrint ("Creating new session to introducer");
+								introducer = &(address->introducers[0]); // TODO:
+								boost::asio::ip::udp::endpoint introducerEndpoint (introducer->iHost, introducer->iPort);
 								introducerSession = new SSUSession (*this, introducerEndpoint, router);
-								m_Sessions[introducerEndpoint] = introducerSession;																
-							}
-							introducerSession->Introduce (introducer.iTag, introducer.iKey);
+								m_Sessions[introducerEndpoint] = introducerSession;													
+							}	
+							// introduce
+							LogPrint ("Introduce new SSU session to [", router->GetIdentHashAbbreviation (), 
+									"] through introducer ", introducer->iHost, ":", introducer->iPort);
+							session->WaitForIntroduction ();	
+							introducerSession->Introduce (introducer->iTag, introducer->iKey);
 						}
 						else
-							LogPrint ("Router is unreachable, but not introducers presentd. Ignored");
+							LogPrint ("Router is unreachable, but no introducers presented. Ignored");
 					}
 				}
 			}