From d6c101d261dc5c46140a07ddc9510d0d588e42e2 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Mon, 19 Dec 2022 13:28:21 -0500
Subject: [PATCH] try to handle RelayIntro again is Alice's RouterInfo not
 found

---
 libi2pd/SSU2Session.cpp | 19 ++++++++++++++++---
 libi2pd/SSU2Session.h   |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/libi2pd/SSU2Session.cpp b/libi2pd/SSU2Session.cpp
index aedf346c..9c2153a6 100644
--- a/libi2pd/SSU2Session.cpp
+++ b/libi2pd/SSU2Session.cpp
@@ -1836,7 +1836,7 @@ namespace transport
 		session->SendData (payload, payloadSize);
 	}
 
-	void SSU2Session::HandleRelayIntro (const uint8_t * buf, size_t len)
+	void SSU2Session::HandleRelayIntro (const uint8_t * buf, size_t len, int attempts)
 	{
 		// we are Charlie
 		SSU2RelayResponseCode code = eSSU2RelayResponseCodeAccept;
@@ -1891,9 +1891,22 @@ namespace transport
 				code = eSSU2RelayResponseCodeCharlieSignatureFailure;
 			}
 		}
-		else
+		else if (!attempts)
+		{
+			// RouterInfo migth come in the next packet, try again
+			auto vec = std::make_shared<std::vector<uint8_t> >(len);
+			memcpy (vec->data (), buf, len);
+			auto s = shared_from_this ();
+			m_Server.GetService ().post ([s, vec, attempts]()
+				{
+					LogPrint (eLogDebug, "SSU2: RelayIntro attempt ", attempts + 1);
+					s->HandleRelayIntro (vec->data (), vec->size (), attempts + 1);
+				});	
+			return;
+		}	
+		else	
 		{
-			LogPrint (eLogError, "SSU2: RelayIntro unknown router to introduce");
+			LogPrint (eLogWarning, "SSU2: RelayIntro unknown router to introduce");
 			code = eSSU2RelayResponseCodeCharlieAliceIsUnknown;
 		}
 		// send relay response to Bob
diff --git a/libi2pd/SSU2Session.h b/libi2pd/SSU2Session.h
index c9592a58..aab02127 100644
--- a/libi2pd/SSU2Session.h
+++ b/libi2pd/SSU2Session.h
@@ -305,7 +305,7 @@ namespace transport
 			void HandleFollowOnFragment (const uint8_t * buf, size_t len);
 			bool ConcatOutOfSequenceFragments (std::shared_ptr<SSU2IncompleteMessage> m); // true if message complete
 			void HandleRelayRequest (const uint8_t * buf, size_t len);
-			void HandleRelayIntro (const uint8_t * buf, size_t len);
+			void HandleRelayIntro (const uint8_t * buf, size_t len, int attempts = 0);
 			void HandleRelayResponse (const uint8_t * buf, size_t len);
 			void HandlePeerTest (const uint8_t * buf, size_t len);