From 65c210eb4a059a8f5cf22a6b5cce46ca5e80bd55 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Sat, 8 Aug 2026 11:31:41 -0400
Subject: [PATCH] send interested/notinterested after receiving have message

---
 libi2pd_client/Torrents.cpp | 39 +++++++++++++++++++++++++++++--------
 libi2pd_client/Torrents.h   |  4 +++-
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/libi2pd_client/Torrents.cpp b/libi2pd_client/Torrents.cpp
index eb7ca6b2..44a89127 100644
--- a/libi2pd_client/Torrents.cpp
+++ b/libi2pd_client/Torrents.cpp
@@ -779,13 +779,19 @@ namespace torrents
 			if (m_NumRequests < MAX_NUM_REQUESTS && m_Torrent && !m_Torrent->IsComplete ())
 			{
 				Piece& piece = m_Torrent->GetPiece (index);
-				if (!piece.IsComplete () && !piece.IsRequested ())
+				if (!piece.IsComplete ())
 				{
-					// new piece that was not requested yet
-					auto [offset, len] = piece.GetNextBlockToRequest ();
-					if (len > 0)
-						SendRequestMsg (index, offset, len);
+					SendInterestedMsg ();
+					if (!piece.IsRequested ())
+					{
+						// new piece that was not requested yet
+						auto [offset, len] = piece.GetNextBlockToRequest ();
+						if (len > 0)
+							SendRequestMsg (index, offset, len);
+					}
 				}
+				else
+					SendNotinterestedMsg ();
 			}
 		}
 	}
@@ -805,6 +811,7 @@ namespace torrents
 	void PeerConnection::HandleBitfieldMsg (const uint8_t * buf, size_t len)
 	{
 		if (!m_Torrent) return;
+		bool isInterested = false;
 		size_t numPieces = m_Torrent->GetNumPieces ();
 		m_RemoteBitfield.resize (numPieces);
 		size_t idx = 0;
@@ -815,12 +822,19 @@ namespace torrents
 			{
 				if (idx >= numPieces) break;
 				if (buf[i] & bit)
+				{
 					m_RemoteBitfield.set (idx);
+					if (!isInterested && !m_Torrent->GetPiece (idx).IsComplete ())
+						isInterested = true;
+				}
 				bit >>= 1;
 				idx++;
 			}
 		}
-		SendInterestedMsg ();
+		if (isInterested)
+			SendInterestedMsg ();
+		else
+			SendNotinterestedMsg ();
 	}
 
 	void PeerConnection::SendBitfieldMsg (const uint8_t * bitfield, size_t bitfieldLen)
@@ -895,7 +909,7 @@ namespace torrents
 		htobe32buf (sendBuffer.data () + 5, index);
 		htobe32buf (sendBuffer.data () + 9, offset);
 		memcpy (sendBuffer.data () + 13, data, len);
-		LogPrint (eLogDebug, "Torrents: Sending piece of ", sendBuffer.size (), " bytes");
+		LogPrint (eLogDebug, "Torrents: Sending piece index ", index, " offset ", offset, " length ", len);
 		m_IsSendingPieceMsg = true;
 		m_Stream->AsyncSend (sendBuffer.data (), sendBuffer.size (),
 			[s = shared_from_this ()](const boost::system::error_code& ecode, size_t bytes_transferred)
@@ -933,6 +947,7 @@ namespace torrents
 		}
 		if (index < m_Torrent->GetNumPieces ())
 		{
+			LogPrint (eLogDebug, "Torrents: Received request index ", index, " offset ", offset, " length ", length);
 			Piece& piece = m_Torrent->GetPiece (index);
 			if (piece.HasBlock (offset))
 			{
@@ -951,7 +966,7 @@ namespace torrents
 							boost::asio::post (s->GetTorrentsTunnel ()->GetService (),
 								[requestedBlock = RequestedBlock{index, offset, length}, s]()
 								{
-									if (s->m_IncomingRequestsQueue.empty ())
+									if (!s->m_IsSendingPieceMsg)
 										s->SendRequestedBlock (requestedBlock);
 									else
 										s->m_IncomingRequestsQueue.emplace_back (std::move (requestedBlock));
@@ -1001,6 +1016,14 @@ namespace torrents
 		WriteToStream (buf, INTERESTED_MSG_LENGTH);
 	}
 
+	void PeerConnection::SendNotinterestedMsg ()
+	{
+		uint8_t buf[NOTINTERESTED_MSG_LENGTH];
+		htobe32buf (buf, 1);
+		buf[4] = eMessageTypeNotInterested;
+		WriteToStream (buf, NOTINTERESTED_MSG_LENGTH);
+	}
+
 	void PeerConnection::SendUnchokeMsg ()
 	{
 		uint8_t buf[UNCHOKE_MSG_LENGTH];
diff --git a/libi2pd_client/Torrents.h b/libi2pd_client/Torrents.h
index 1838669e..17c406a9 100644
--- a/libi2pd_client/Torrents.h
+++ b/libi2pd_client/Torrents.h
@@ -52,6 +52,7 @@ namespace torrents
 
 	constexpr size_t HANDSHAKE_MSG_LENGTH = 68;
 	constexpr size_t INTERESTED_MSG_LENGTH = 5;
+	constexpr size_t NOTINTERESTED_MSG_LENGTH = 5;
 	constexpr size_t UNCHOKE_MSG_LENGTH = 5;
 	constexpr size_t REQUEST_MSG_PAYLOAD_LENGTH = 12;
 	constexpr size_t HAVE_MSG_PAYLOAD_LENGTH = 4;
@@ -174,7 +175,7 @@ namespace torrents
 		struct RequestedBlock
 		{
 			uint32_t index, offset, length;
-			RequestedBlock (uint32_t i, uint32_t o, uint32_t l): index(i), offset(0), length (l) {}
+			RequestedBlock (uint32_t i, uint32_t o, uint32_t l): index(i), offset(o), length (l) {}
 			RequestedBlock(const RequestedBlock& ) = default;
 			RequestedBlock(RequestedBlock&& ) = default;
 		};
@@ -220,6 +221,7 @@ namespace torrents
 			void HandleRequestMsg (const uint8_t * buf, size_t len);
 			void SendRequestMsg (uint32_t index, uint32_t offset, uint32_t len);
 			void SendInterestedMsg ();
+			void SendNotinterestedMsg ();
 			void SendUnchokeMsg ();
 			void HandleChokeMsg ();