handle PeerTest message

libi2pd/SSU2.cpp

@@ -826,6 +826,38 @@ namespace transport
 		return true;
 	}
 
+	bool SSU2Session::ProcessPeerTest (uint8_t * buf, size_t len)
+	{
+		// we are Alice or Charlie
+		Header header;
+		memcpy (header.buf, buf, 16);
+		header.ll[0] ^= CreateHeaderMask (i2p::context.GetSSU2IntroKey (), buf + (len - 24));
+		header.ll[1] ^= CreateHeaderMask (i2p::context.GetSSU2IntroKey (), buf + (len - 12));
+		if (header.h.type != eSSU2PeerTest) 
+		{
+			LogPrint (eLogWarning, "SSU2: Unexpected message type  ", (int)header.h.type);
+			return false;
+		}	
+		uint8_t nonce[12] = {0};
+		uint64_t headerX[2]; // sourceConnID, token
+		i2p::crypto::ChaCha20 (buf + 16, 16, i2p::context.GetSSU2IntroKey (), nonce, (uint8_t *)headerX);
+		m_DestConnID = headerX[0];
+		// decrypt and handle payload
+		uint8_t * payload = buf + 32;
+		CreateNonce (be32toh (header.h.packetNum), nonce);
+		uint8_t h[32];
+		memcpy (h, header.buf, 16);
+		memcpy (h + 16, &headerX, 16);
+		if (!i2p::crypto::AEADChaCha20Poly1305 (payload, len - 48, h, 32, 
+			i2p::context.GetSSU2IntroKey (), nonce, payload, len - 48, false))
+		{
+			LogPrint (eLogWarning, "SSU2: PeerTest AEAD verification failed ");
+			return false;
+		}
+		HandlePayload (payload, len - 48);
+		return true;
+	}	
+		
 	uint32_t SSU2Session::SendData (const uint8_t * buf, size_t len)
 	{
 		if (len < 8)
@@ -1837,15 +1869,25 @@ namespace transport
 		}
 		if (m_LastSession)
 		{
-			if (m_LastSession->IsEstablished ())
+			switch (m_LastSession->GetState ())
-				m_LastSession->ProcessData (buf, len);
-			else if (m_LastSession->GetState () == eSSU2SessionStateIntroduced)
 			{
-				m_LastSession->SetRemoteEndpoint (senderEndpoint);
+				case eSSU2SessionStateEstablished:
-				m_LastSession->ProcessHolePunch (buf, len);
+					m_LastSession->ProcessData (buf, len);
+				break;
+				case eSSU2SessionStateUnknown:
+					m_LastSession->ProcessSessionConfirmed (buf, len);
+				break;	
+				case eSSU2SessionStateIntroduced:
+					m_LastSession->SetRemoteEndpoint (senderEndpoint);
+					m_LastSession->ProcessHolePunch (buf, len);
+				break;
+				case eSSU2SessionStatePeerTest:
+					m_LastSession->SetRemoteEndpoint (senderEndpoint);
+					m_LastSession->ProcessPeerTest (buf, len);
+				break;	
+				default:
+					LogPrint (eLogWarning, "SSU2: Invalid session state ", (int)m_LastSession->GetState ());
 			}	
-			else	
-				m_LastSession->ProcessSessionConfirmed (buf, len);
 		}	
 		else 
 		{

libi2pd/SSU2.h

@@ -43,6 +43,7 @@ namespace transport
 		eSSU2SessionCreated = 1,
 		eSSU2SessionConfirmed = 2,
 		eSSU2Data = 6,
+		eSSU2PeerTest = 7,
 		eSSU2Retry = 9,
 		eSSU2TokenRequest = 10,
 		eSSU2HolePunch = 11
@@ -78,6 +79,7 @@ namespace transport
 	{
 		eSSU2SessionStateUnknown,
 		eSSU2SessionStateIntroduced,
+		eSSU2SessionStatePeerTest,
 		eSSU2SessionStateEstablished,
 		eSSU2SessionStateTerminated,
 		eSSU2SessionStateFailed
@@ -164,6 +166,7 @@ namespace transport
 			bool ProcessSessionConfirmed (uint8_t * buf, size_t len);
 			bool ProcessRetry (uint8_t * buf, size_t len);
 			bool ProcessHolePunch (uint8_t * buf, size_t len);
+			bool ProcessPeerTest (uint8_t * buf, size_t len);
 			void ProcessData (uint8_t * buf, size_t len);
 			
 		private: