libi2pd/SSU2.cpp

@@ -477,7 +477,7 @@ namespace transport
 		HandleReceivedPackets (std::move (receivedPackets));
 	}	
 		
-	bool SSU2Server::AddSession (std::shared_ptr<SSU2Session> session)
+	void SSU2Server::AddSession (std::shared_ptr<SSU2Session> session)
 	{
 		if (session)
 		{
@@ -485,10 +485,8 @@ namespace transport
 			{	
 				if (session->GetState () != eSSU2SessionStatePeerTest)
 					AddSessionByRouterHash (session);
-				return true;
 			}	
 		}
-		return false;
 	}
 
 	void SSU2Server::RemoveSession (uint64_t connID)

libi2pd/SSU2.h

@@ -85,7 +85,7 @@ namespace transport
 			bool IsSyncClockFromPeers () const { return m_IsSyncClockFromPeers; };
 			void AdjustTimeOffset (int64_t offset, std::shared_ptr<const i2p::data::IdentityEx> from);
 
-			bool AddSession (std::shared_ptr<SSU2Session> session);
+			void AddSession (std::shared_ptr<SSU2Session> session);
 			void RemoveSession (uint64_t connID);
 			void RequestRemoveSession (uint64_t connID);
 			void AddSessionByRouterHash (std::shared_ptr<SSU2Session> session);

libi2pd/SSU2Session.cpp

@@ -1931,28 +1931,25 @@ namespace transport
 			return;
 		}
 		auto mts = i2p::util::GetMillisecondsSinceEpoch ();
-		uint32_t nonce = bufbe32toh (buf + 1);
+		session->m_RelaySessions.emplace (bufbe32toh (buf + 1), // nonce
-		if (session->m_RelaySessions.emplace (nonce, std::make_pair (shared_from_this (), mts/1000)).second)
+			std::make_pair (shared_from_this (), mts/1000) );
-		{
-			// send relay intro to Charlie
-			auto r = i2p::data::netdb.FindRouter (GetRemoteIdentity ()->GetIdentHash ()); // Alice's RI
-			if (r && (r->IsUnreachable () || !i2p::data::netdb.PopulateRouterInfoBuffer (r))) r = nullptr;
-			if (!r) LogPrint (eLogWarning, "SSU2: RelayRequest Alice's router info not found");
 
-			auto packet = m_Server.GetSentPacketsPool ().AcquireShared ();
+		// send relay intro to Charlie
-			packet->payloadSize = r ? CreateRouterInfoBlock (packet->payload, m_MaxPayloadSize - len - 32, r) : 0;
+		auto r = i2p::data::netdb.FindRouter (GetRemoteIdentity ()->GetIdentHash ()); // Alice's RI
-			if (!packet->payloadSize && r)
+		if (r && (r->IsUnreachable () || !i2p::data::netdb.PopulateRouterInfoBuffer (r))) r = nullptr;
-				session->SendFragmentedMessage (CreateDatabaseStoreMsg (r));
+		if (!r) LogPrint (eLogWarning, "SSU2: RelayRequest Alice's router info not found");
-			packet->payloadSize += CreateRelayIntroBlock (packet->payload + packet->payloadSize, m_MaxPayloadSize - packet->payloadSize, buf + 1, len -1);
+
-			if (packet->payloadSize < m_MaxPayloadSize)
+		auto packet = m_Server.GetSentPacketsPool ().AcquireShared ();
-				packet->payloadSize += CreatePaddingBlock (packet->payload + packet->payloadSize, m_MaxPayloadSize - packet->payloadSize);
+		packet->payloadSize = r ? CreateRouterInfoBlock (packet->payload, m_MaxPayloadSize - len - 32, r) : 0;
-			uint32_t packetNum = session->SendData (packet->payload, packet->payloadSize);
+		if (!packet->payloadSize && r)
-			packet->sendTime = mts;
+			session->SendFragmentedMessage (CreateDatabaseStoreMsg (r));
-			// Charlie always responds with RelayResponse
+		packet->payloadSize += CreateRelayIntroBlock (packet->payload + packet->payloadSize, m_MaxPayloadSize - packet->payloadSize, buf + 1, len -1);
-			session->m_SentPackets.emplace (packetNum, packet);
+		if (packet->payloadSize < m_MaxPayloadSize)
-		}
+			packet->payloadSize += CreatePaddingBlock (packet->payload + packet->payloadSize, m_MaxPayloadSize - packet->payloadSize);
-		else
+		uint32_t packetNum = session->SendData (packet->payload, packet->payloadSize);
-			LogPrint (eLogInfo, "SSU2: Relay request nonce ", nonce, " already exists. Ignore");
+		packet->sendTime = mts;
+		// Charlie always responds with RelayResponse
+		session->m_SentPackets.emplace (packetNum, packet);
 	}
 
 	void SSU2Session::HandleRelayIntro (const uint8_t * buf, size_t len, int attempts)
@@ -2038,13 +2035,8 @@ namespace transport
 		{
 			// send HolePunch 
 			auto holePunchSession = std::make_shared<SSU2HolePunchSession>(m_Server, nonce, ep, addr); 
-			if (m_Server.AddSession (holePunchSession))
+			m_Server.AddSession (holePunchSession);
-				holePunchSession->SendHolePunch (packet->payload, packet->payloadSize); // relay response block
+			holePunchSession->SendHolePunch (packet->payload, packet->payloadSize); // relay response block
-			else
-			{
-				LogPrint (eLogInfo, "SSU2: Relay intro nonce ", nonce, " already exists. Ignore");
-				return;
-			}		
 		}	
 		packet->payloadSize += CreatePaddingBlock (packet->payload + packet->payloadSize, m_MaxPayloadSize - packet->payloadSize);
 		uint32_t packetNum = SendData (packet->payload, packet->payloadSize);
@@ -2162,33 +2154,29 @@ namespace transport
 					GetRemoteIdentity ()->GetIdentHash ());
 				if (session) // session with Charlie
 				{
-					if (m_Server.AddPeerTest (nonce, shared_from_this (), ts/1000))
+					m_Server.AddPeerTest (nonce, shared_from_this (), ts/1000);
+					auto packet = m_Server.GetSentPacketsPool ().AcquireShared ();
+					// Alice's RouterInfo
+					auto r = i2p::data::netdb.FindRouter (GetRemoteIdentity ()->GetIdentHash ());
+					if (r && (r->IsUnreachable () || !i2p::data::netdb.PopulateRouterInfoBuffer (r))) r = nullptr;
+					packet->payloadSize = r ? CreateRouterInfoBlock (packet->payload, m_MaxPayloadSize - len - 32, r) : 0;
+					if (!packet->payloadSize && r)
+						session->SendFragmentedMessage (CreateDatabaseStoreMsg (r));
+					if (packet->payloadSize + len + 48 > m_MaxPayloadSize)
 					{
-						auto packet = m_Server.GetSentPacketsPool ().AcquireShared ();
+						// doesn't fit one message, send RouterInfo in separate message
-						// Alice's RouterInfo
-						auto r = i2p::data::netdb.FindRouter (GetRemoteIdentity ()->GetIdentHash ());
-						if (r && (r->IsUnreachable () || !i2p::data::netdb.PopulateRouterInfoBuffer (r))) r = nullptr;
-						packet->payloadSize = r ? CreateRouterInfoBlock (packet->payload, m_MaxPayloadSize - len - 32, r) : 0;
-						if (!packet->payloadSize && r)
-							session->SendFragmentedMessage (CreateDatabaseStoreMsg (r));
-						if (packet->payloadSize + len + 48 > m_MaxPayloadSize)
-						{
-							// doesn't fit one message, send RouterInfo in separate message
-							uint32_t packetNum = session->SendData (packet->payload, packet->payloadSize, SSU2_FLAG_IMMEDIATE_ACK_REQUESTED);
-							packet->sendTime = ts;
-							session->m_SentPackets.emplace (packetNum, packet);
-							packet = m_Server.GetSentPacketsPool ().AcquireShared (); // new packet
-						}
-						// PeerTest to Charlie
-						packet->payloadSize += CreatePeerTestBlock (packet->payload + packet->payloadSize, m_MaxPayloadSize - packet->payloadSize, 2,
-							eSSU2PeerTestCodeAccept, GetRemoteIdentity ()->GetIdentHash (), buf + offset, len - offset);
-						packet->payloadSize += CreatePaddingBlock (packet->payload + packet->payloadSize, m_MaxPayloadSize - packet->payloadSize);
 						uint32_t packetNum = session->SendData (packet->payload, packet->payloadSize, SSU2_FLAG_IMMEDIATE_ACK_REQUESTED);
 						packet->sendTime = ts;
 						session->m_SentPackets.emplace (packetNum, packet);
+						packet = m_Server.GetSentPacketsPool ().AcquireShared (); // new packet
 					}
-					else
+					// PeerTest to Charlie
-						LogPrint (eLogInfo, "SSU2: Peer test 1 nonce ", nonce, " already exists. Ignored");
+					packet->payloadSize += CreatePeerTestBlock (packet->payload + packet->payloadSize, m_MaxPayloadSize - packet->payloadSize, 2,
+						eSSU2PeerTestCodeAccept, GetRemoteIdentity ()->GetIdentHash (), buf + offset, len - offset);
+					packet->payloadSize += CreatePaddingBlock (packet->payload + packet->payloadSize, m_MaxPayloadSize - packet->payloadSize);
+					uint32_t packetNum = session->SendData (packet->payload, packet->payloadSize, SSU2_FLAG_IMMEDIATE_ACK_REQUESTED);
+					packet->sendTime = ts;
+					session->m_SentPackets.emplace (packetNum, packet);
 				}
 				else
 				{
@@ -3055,7 +3043,7 @@ namespace transport
 		{
 			if (ts > it->second.second + SSU2_RELAY_NONCE_EXPIRATION_TIMEOUT)
 			{
-				LogPrint (eLogInfo, "SSU2: Relay nonce ", it->first, " was not responded in ", SSU2_RELAY_NONCE_EXPIRATION_TIMEOUT, " seconds, deleted");
+				LogPrint (eLogWarning, "SSU2: Relay nonce ", it->first, " was not responded in ", SSU2_RELAY_NONCE_EXPIRATION_TIMEOUT, " seconds, deleted");
 				it = m_RelaySessions.erase (it);
 			}
 			else