dandri/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2026-03-30 12:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

delete expired unacked datagrams. drop packets if window is full

Browse Source
This commit is contained in:
orignal
2025-11-25 17:15:48 -05:00
parent 4618534ca9
commit aeda3bc006
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libi2pd_client/UDPTunnel.cpp
View File

@@ -186,6 +186,7 @@ namespace client
if (ecode != boost::asio::error::operation_aborted)
{
LogPrint (eLogInfo, "UDP Connection: Packet ", m_AckTimerSeqn, " was not acked");
DeleteExpiredUnackedDatagrams ();
m_AckTimerSeqn = 0;
m_RTT = 0;
// send empty packet with reset path flag
@@ -198,6 +199,19 @@ namespace client
});
}
}
void UDPConnection::DeleteExpiredUnackedDatagrams ()
{
if (m_UnackedDatagrams.empty ()) return;
auto expired = i2p::util::GetMillisecondsSinceEpoch () - (m_RTT ? 2*m_RTT : I2P_UDP_MAX_UNACKED_DATAGRAM_TIME);
auto it = m_UnackedDatagrams.begin ();
while (it != m_UnackedDatagrams.end ())
{
if (it->second < expired) break;
it++;
}
m_UnackedDatagrams.erase (m_UnackedDatagrams.begin (), it);
}
UDPSession::UDPSession(boost::asio::ip::udp::endpoint localEndpoint,
const std::shared_ptr<i2p::client::ClientDestination> & localDestination,
@@ -442,6 +456,12 @@ namespace client
RecvFromLocal ();
return; // drop, remote not resolved
}
if (!m_UnackedDatagrams.empty () && m_NextSendPacketNum > m_UnackedDatagrams.front ().first + I2P_UDP_MAX_NUM_UNACKED_DATAGRAMS)
{
// window is full, drop packet
RecvFromLocal ();
return;
}
auto remotePort = m_RecvEndpoint.port ();
if (!m_LastPort || m_LastPort != remotePort)
{
@@ -464,15 +484,8 @@ namespace client
if (ts > m_LastSession->second + repliableDatagramInterval)
{
if (m_DatagramVersion == i2p::datagram::eDatagramV3)
{
{
uint8_t flags = 0;
if (!m_UnackedDatagrams.empty () && m_NextSendPacketNum > m_UnackedDatagrams.front ().first + I2P_UDP_MAX_NUM_UNACKED_DATAGRAMS)
{
m_UnackedDatagrams.clear ();
session->DropSharedRoutingPath ();
m_RTT = 0;
flags |= UDP_SESSION_FLAG_RESET_PATH;
}
if (!m_RTT || !m_AckTimerSeqn || (!m_UnackedDatagrams.empty () &&
ts > m_UnackedDatagrams.back ().second + repliableDatagramInterval)) // last ack request
{

3
libi2pd_client/UDPTunnel.h
View File

@@ -51,7 +51,8 @@ namespace client
virtual void Stop ();
void Acked (uint32_t seqn);
void ScheduleAckTimer (uint32_t seqn);
void ScheduleAckTimer (uint32_t seqn);
void DeleteExpiredUnackedDatagrams ();
virtual std::shared_ptr<i2p::datagram::DatagramSession> GetDatagramSession () = 0;
virtual i2p::datagram::DatagramDestination * GetDatagramDestination () const = 0;