From 1a9c65883644c892a4f73add373f4c1e17301fe6 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Thu, 1 Sep 2022 18:40:54 -0400
Subject: [PATCH] immediate ack request flag

---
 libi2pd/SSU2Session.cpp | 13 ++++++++++---
 libi2pd/SSU2Session.h   |  5 ++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/libi2pd/SSU2Session.cpp b/libi2pd/SSU2Session.cpp
index 87181da6..2a6ef162 100644
--- a/libi2pd/SSU2Session.cpp
+++ b/libi2pd/SSU2Session.cpp
@@ -367,10 +367,11 @@ namespace transport
 			};
 			if (packet->payloadSize > ackBlockSize)
 			{
+				// last
 				ackBlockSent = true;
 				if (packet->payloadSize + 16 < m_MaxPayloadSize)
 					packet->payloadSize += CreatePaddingBlock (packet->payload + packet->payloadSize, m_MaxPayloadSize - packet->payloadSize);
-				uint32_t packetNum = SendData (packet->payload, packet->payloadSize);
+				uint32_t packetNum = SendData (packet->payload, packet->payloadSize, SSU2_FLAG_IMMEDIATE_ACK_REQUESTED);
 				packet->sendTime = ts;
 				m_SentPackets.emplace (packetNum, packet);
 			}
@@ -419,9 +420,14 @@ namespace transport
 			packet = m_Server.GetSentPacketsPool ().AcquireShared ();
 			packet->payloadSize = CreateFollowOnFragmentBlock (packet->payload, m_MaxPayloadSize - offset, msg, fragmentNum, msgID);
 			extraSize -= offset;
+			uint8_t flags = 0;
 			if (msg->offset >= msg->len && packet->payloadSize + 16 < m_MaxPayloadSize) // last fragment
+			{	
 				packet->payloadSize += CreatePaddingBlock (packet->payload + packet->payloadSize, m_MaxPayloadSize - packet->payloadSize);
-			uint32_t followonPacketNum = SendData (packet->payload, packet->payloadSize);
+				if (fragmentNum > 2) // 3 or more fragments
+					flags |= SSU2_FLAG_IMMEDIATE_ACK_REQUESTED;
+			}	
+			uint32_t followonPacketNum = SendData (packet->payload, packet->payloadSize, flags);
 			packet->sendTime = ts;
 			m_SentPackets.emplace (followonPacketNum, packet);
 		}
@@ -1267,7 +1273,7 @@ namespace transport
 		return true;
 	}
 
-	uint32_t SSU2Session::SendData (const uint8_t * buf, size_t len)
+	uint32_t SSU2Session::SendData (const uint8_t * buf, size_t len, uint8_t flags)
 	{
 		if (len < 8)
 		{
@@ -1279,6 +1285,7 @@ namespace transport
 		header.h.packetNum = htobe32 (m_SendPacketNum);
 		header.h.type = eSSU2Data;
 		memset (header.h.flags, 0, 3);
+		if (flags) header.h.flags[0] = flags;
 		uint8_t nonce[12];
 		CreateNonce (m_SendPacketNum, nonce);
 		uint8_t payload[SSU2_MAX_PACKET_SIZE];
diff --git a/libi2pd/SSU2Session.h b/libi2pd/SSU2Session.h
index 7f8020f2..1e2644ab 100644
--- a/libi2pd/SSU2Session.h
+++ b/libi2pd/SSU2Session.h
@@ -48,6 +48,9 @@ namespace transport
 	const int SSU2_MAX_NUM_ACK_RANGES = 32; // to send
 	const uint8_t SSU2_MAX_NUM_FRAGMENTS = 64;
 
+	// flags
+	const uint8_t SSU2_FLAG_IMMEDIATE_ACK_REQUESTED = 0x01;	
+	
 	enum SSU2MessageType
 	{
 		eSSU2SessionRequest = 0,
@@ -275,7 +278,7 @@ namespace transport
 			void KDFDataPhase (uint8_t * keydata_ab, uint8_t * keydata_ba);
 			void SendTokenRequest ();
 			void SendRetry ();
-			uint32_t SendData (const uint8_t * buf, size_t len); // returns packet num
+			uint32_t SendData (const uint8_t * buf, size_t len, uint8_t flags = 0); // returns packet num
 			void SendQuickAck ();
 			void SendTermination ();
 			void SendHolePunch (uint32_t nonce, const boost::asio::ip::udp::endpoint& ep, const uint8_t * introKey, uint64_t token);