PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-19 01:09:58 +00:00
Code Issues Releases Activity

change tunnels during stream resend attempts 5 and 6

Browse Source
This commit is contained in:
Vort 2024-04-07 16:47:06 +03:00
parent 1b5f67e185
commit df3dc1f574
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libi2pd/Streaming.cpp
View File

@ -1024,34 +1024,31 @@ namespace stream
if (packets.size () > 0) if (packets.size () > 0)
{ {
m_NumResendAttempts++; m_NumResendAttempts++;
if (m_RTO != INITIAL_RTO) if (m_NumResendAttempts == 1 && m_RTO != INITIAL_RTO)
m_RTO *= 2;
switch (m_NumResendAttempts)
{ {
case 1: // congestion avoidance // congestion avoidance
m_WindowSize -= (m_WindowSize + WINDOW_SIZE_DROP_FRACTION) / WINDOW_SIZE_DROP_FRACTION; // adjustment >= 1 m_RTO *= 2;
if (m_WindowSize < MIN_WINDOW_SIZE) m_WindowSize = MIN_WINDOW_SIZE; m_WindowSize -= (m_WindowSize + WINDOW_SIZE_DROP_FRACTION) / WINDOW_SIZE_DROP_FRACTION; // adjustment >= 1
break; if (m_WindowSize < MIN_WINDOW_SIZE) m_WindowSize = MIN_WINDOW_SIZE;
case 2: }
m_TunnelsChangeSequenceNumber = m_SequenceNumber; else
m_RTO = INITIAL_RTO; // drop RTO to initial upon tunnels pair change first time {
#if (__cplusplus >= 201703L) // C++ 17 or higher m_TunnelsChangeSequenceNumber = m_SequenceNumber;
[[fallthrough]]; m_RTO = INITIAL_RTO; // drop RTO to initial upon tunnels pair change
#endif if (m_RoutingSession) m_RoutingSession->SetSharedRoutingPath (nullptr);
// no break here if (m_NumResendAttempts & 1)
case 4: {
if (m_RoutingSession) m_RoutingSession->SetSharedRoutingPath (nullptr);
UpdateCurrentRemoteLease (); // pick another lease
LogPrint (eLogWarning, "Streaming: Another remote lease has been selected for stream with rSID=", m_RecvStreamID, ", sSID=", m_SendStreamID);
break;
case 3:
// pick another outbound tunnel // pick another outbound tunnel
m_TunnelsChangeSequenceNumber = m_SequenceNumber;
if (m_RoutingSession) m_RoutingSession->SetSharedRoutingPath (nullptr);
m_CurrentOutboundTunnel = m_LocalDestination.GetOwner ()->GetTunnelPool ()->GetNextOutboundTunnel (m_CurrentOutboundTunnel); m_CurrentOutboundTunnel = m_LocalDestination.GetOwner ()->GetTunnelPool ()->GetNextOutboundTunnel (m_CurrentOutboundTunnel);
LogPrint (eLogWarning, "Streaming: Another outbound tunnel has been selected for stream with sSID=", m_SendStreamID); LogPrint (eLogWarning, "Streaming: Resend #", m_NumResendAttempts,
break; ", another outbound tunnel has been selected for stream with sSID=", m_SendStreamID);
default: ; }
else
{
UpdateCurrentRemoteLease (); // pick another lease
LogPrint (eLogWarning, "Streaming: Resend #", m_NumResendAttempts,
", another remote lease has been selected for stream with rSID=", m_RecvStreamID, ", sSID=", m_SendStreamID);
}
} }
SendPackets (packets); SendPackets (packets);
} }