From 855fd4d471421cec5e482b3fadd23aa5da53f489 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Fri, 6 Sep 2024 09:49:24 -0400
Subject: [PATCH] eliminate extra parsing of RouterInfo coming as RouterInfo
 block

---
 libi2pd/NTCP2.cpp       |  5 ++---
 libi2pd/SSU2Session.cpp | 40 +++++++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/libi2pd/NTCP2.cpp b/libi2pd/NTCP2.cpp
index de14d3b0..f7d81671 100644
--- a/libi2pd/NTCP2.cpp
+++ b/libi2pd/NTCP2.cpp
@@ -955,9 +955,8 @@ namespace transport
 				break;
 				case eNTCP2BlkRouterInfo:
 				{
-					LogPrint (eLogDebug, "NTCP2: RouterInfo flag=", (int)frame[offset]);
-					i2p::data::RouterInfo ri (frame + offset + 1, size - 1);	
-					auto newRi = i2p::data::netdb.AddRouterInfo (ri.GetBuffer (), ri.GetBufferLen ());
+					LogPrint (eLogDebug, "NTCP2: RouterInfo flag=", (int)frame[offset]);	
+					auto newRi = i2p::data::netdb.AddRouterInfo (frame + offset + 1, size - 1);
 					if (newRi)
 					{
 						auto remoteIdentity = GetRemoteIdentity ();
diff --git a/libi2pd/SSU2Session.cpp b/libi2pd/SSU2Session.cpp
index 62bbf41f..eb662716 100644
--- a/libi2pd/SSU2Session.cpp
+++ b/libi2pd/SSU2Session.cpp
@@ -1750,28 +1750,34 @@ namespace transport
 
 	void SSU2Session::HandleRouterInfo (const uint8_t * buf, size_t len)
 	{
-		auto ri = ExtractRouterInfo (buf, len);
-		if (ri)
+		if (len < 2) return;
+		// not from SessionConfirmed, we must add it instantly to use in next block
+		std::shared_ptr<const i2p::data::RouterInfo> newRi;
+		if (buf[0] & SSU2_ROUTER_INFO_FLAG_GZIP) // compressed?
 		{	
-			// not from SessionConfirmed, we must add it instantly to use in next block
-			auto newRi = i2p::data::netdb.AddRouterInfo (ri->GetBuffer (), ri->GetBufferLen ());	// TODO: add ri
-			if (newRi)
+			auto ri = ExtractRouterInfo (buf, len);
+			if (ri)
+				newRi = i2p::data::netdb.AddRouterInfo (ri->GetBuffer (), ri->GetBufferLen ());
+		}	
+		else // use buffer directly. TODO: handle frag
+			newRi = i2p::data::netdb.AddRouterInfo (buf + 2, len - 2);
+
+		if (newRi)
+		{
+			auto remoteIdentity = GetRemoteIdentity ();
+			if (remoteIdentity && remoteIdentity->GetIdentHash () == newRi->GetIdentHash ())
 			{
-				auto remoteIdentity = GetRemoteIdentity ();
-				if (remoteIdentity && remoteIdentity->GetIdentHash () == newRi->GetIdentHash ())
+				// peer's RouterInfo update
+				SetRemoteIdentity (newRi->GetIdentity ());
+				auto address = m_RemoteEndpoint.address ().is_v6 () ? newRi->GetSSU2V6Address () : newRi->GetSSU2V4Address ();
+				if (address)
 				{
-					// peer's RouterInfo update
-					SetRemoteIdentity (newRi->GetIdentity ());
-					auto address = m_RemoteEndpoint.address ().is_v6 () ? newRi->GetSSU2V6Address () : newRi->GetSSU2V4Address ();
-					if (address)
-					{
-						m_Address = address;
-						if (IsOutgoing () && m_RelayTag && !address->IsIntroducer ())
-							m_RelayTag = 0; // not longer introducer
-					}	
+					m_Address = address;
+					if (IsOutgoing () && m_RelayTag && !address->IsIntroducer ())
+						m_RelayTag = 0; // not longer introducer
 				}	
 			}	
-		}	
+		}		
 	}	
 		
 	void SSU2Session::HandleAck (const uint8_t * buf, size_t len)