dandri/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2026-07-28 20:59:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

limit receive queue size

Browse Source
This commit is contained in:
orignal
2026-03-03 18:59:44 -05:00
parent d81b0b6f25
commit 67013852d0
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libi2pd/Streaming.cpp
+31 -6
View File
@@ -89,7 +89,7 @@ namespace stream
m_LastConfirmedReceivedSequenceNumber (0), // for limit inbound speed
m_Status (eStreamStatusNew), m_IsIncoming (false), m_IsAckSendScheduled (false), m_IsNAcked (false), m_IsFirstACK (false),
m_IsResendNeeded (false), m_IsFirstRttSample (false), m_IsSendTime (true),
m_IsWinDropped (true), m_IsChoking2 (false), m_IsClientChoked (false), m_IsClientChoked2 (false),
m_IsWinDropped (true), m_IsChoking2 (false), m_IsChoking3 (false), m_IsClientChoked (false), m_IsClientChoked2 (false),
m_IsTimeOutResend (false), m_IsImmediateAckRequested (false), m_IsRemoteLeaseChangeInProgress (false),
m_IsBufferEmpty (false), m_IsJavaClient (false), m_DontSign (local.GetOwner ()->IsStreamingDontSign ()),
m_LocalDestination (local), m_RemoteLeaseSet (remote), m_ReceiveTimer (m_Service),
@@ -123,7 +123,7 @@ namespace stream
m_LastConfirmedReceivedSequenceNumber (0), // for limit inbound speed
m_Status (eStreamStatusNew), m_IsIncoming (true), m_IsAckSendScheduled (false), m_IsNAcked (false), m_IsFirstACK (false),
m_IsResendNeeded (false), m_IsFirstRttSample (false), m_IsSendTime (true),
m_IsWinDropped (true), m_IsChoking2 (false), m_IsClientChoked (false), m_IsClientChoked2 (false),
m_IsWinDropped (true), m_IsChoking2 (false), m_IsChoking3 (false), m_IsClientChoked (false), m_IsClientChoked2 (false),
m_IsTimeOutResend (false), m_IsImmediateAckRequested (false), m_IsRemoteLeaseChangeInProgress (false),
m_IsBufferEmpty (false), m_IsJavaClient (false), m_DontSign (local.GetOwner ()->IsStreamingDontSign ()),
m_LocalDestination (local),m_ReceiveTimer (m_Service), m_SendTimer (m_Service),
@@ -249,6 +249,21 @@ namespace stream
}
LogPrint (eLogDebug, "Streaming: Received seqn=", receivedSeqn, " on sSID=", m_SendStreamID);
if (m_ReceiveQueue.size () > m_MaxWindowSize*3)
{
LogPrint (eLogDebug, "Streaming: ReceiveQueue is full, delete packet");
m_LocalDestination.DeletePacket (packet);
m_IsChoking3 = true;
if (!m_IsAckSendScheduled)
{
SendQuickAck ();
auto ackTimeout = m_RTT/10;
if (ackTimeout > m_AckDelay) ackTimeout = m_AckDelay;
ScheduleAck (ackTimeout);
}
return;
}
if (receivedSeqn == m_LastReceivedSequenceNumber + 1)
{
// we have received next in sequence message
@@ -434,7 +449,14 @@ namespace stream
}
if (delayRequested >= DELAY_CHOKING)
{
if (delayRequested == 65535)
if (delayRequested == DELAY_CHOKING_3)
{
m_NumResendAttempts = 0;
m_WindowDropTargetSize = MIN_WINDOW_SIZE;
m_IsClientChoked = true;
ResetWindowSize ();
}
else if (delayRequested == DELAY_CHOKING_2)
{
m_IsClientChoked2 = true;
m_DropWindowDelaySequenceNumber = m_SequenceNumber-1;
@@ -1188,7 +1210,7 @@ namespace stream
htobe32buf (packet + size, lastReceivedSeqn);
size += 4; // ack Through
uint8_t numNacks = 0;
bool choking = m_IsChoking2;
bool choking = (m_IsChoking2 || m_IsChoking3);
if (lastReceivedSeqn > m_LastReceivedSequenceNumber)
{
// fill NACKs
@@ -1238,7 +1260,9 @@ namespace stream
if (choking || requestImmediateAck)
{
htobe16buf (packet + size, 2); // 2 bytes delay interval
if (m_IsChoking2)
if (m_IsChoking3)
htobe16buf (packet + size + 2, DELAY_CHOKING_3); // set choking3
else if (m_IsChoking2)
htobe16buf (packet + size + 2, DELAY_CHOKING_2); // set choking2
else
htobe16buf (packet + size + 2, choking ? DELAY_CHOKING : 0); // set choking or immediate ack interval
@@ -1258,6 +1282,7 @@ namespace stream
m_LastACKSendTime = ts; // for limit inbound speed
m_LastConfirmedReceivedSequenceNumber = lastReceivedSeqn; // for limit inbound speed
m_IsChoking2 = false;
m_IsChoking3 = false;
LogPrint (eLogDebug, "Streaming: Quick Ack sent. ", (int)numNacks, " NACKs");
}
@@ -1771,7 +1796,7 @@ namespace stream
UpdatePacingTime ();
}
}
else if (m_IsTimeOutResend)
else if (m_IsTimeOutResend && m_NumResendAttempts > 1)
{
m_RTO = INITIAL_RTO; // drop RTO to initial upon tunnels pair change
m_WindowDropTargetSize = INITIAL_WINDOW_SIZE;