shedule ack timer for repliable datagram3
Some checks are pending
Build Debian packages / bookworm (push) Waiting to run
Build Debian packages / bullseye (push) Waiting to run
Build Debian packages / trixie (push) Waiting to run
Build on FreeBSD / with UPnP (push) Waiting to run
Build on OSX / With USE_UPNP=no (push) Waiting to run
Build on OSX / With USE_UPNP=yes (push) Waiting to run
Build on Windows / clang-x86_64 (push) Waiting to run
Build on Windows / i686 (push) Waiting to run
Build on Windows / ucrt-x86_64 (push) Waiting to run
Build on Windows / x86_64 (push) Waiting to run
Build on Windows / CMake clang-x86_64 (push) Waiting to run
Build on Windows / CMake i686 (push) Waiting to run
Build on Windows / CMake ucrt-x86_64 (push) Waiting to run
Build on Windows / CMake x86_64 (push) Waiting to run
Build on Windows / XP (push) Waiting to run
Build on Ubuntu / Make with USE_UPNP=no (push) Waiting to run
Build on Ubuntu / Make with USE_UPNP=yes (push) Waiting to run
Build on Ubuntu / CMake with -DWITH_UPNP=OFF (push) Waiting to run
Build on Ubuntu / CMake with -DWITH_UPNP=ON (push) Waiting to run
Build containers / Building container for linux/amd64 (push) Waiting to run
Build containers / Building container for linux/arm64 (push) Waiting to run
Build containers / Building container for linux/arm/v7 (push) Waiting to run
Build containers / Building container for linux/386 (push) Waiting to run
Build containers / Pushing merged manifest (push) Blocked by required conditions

This commit is contained in:
orignal 2025-10-21 13:27:56 -04:00
parent 1891bd5ba5
commit a6d8203f1c
2 changed files with 38 additions and 4 deletions

View file

@ -283,7 +283,8 @@ namespace client
m_Name (name), m_RemoteDest (remoteDest), m_LocalDest (localDestination), m_LocalEndpoint (localEndpoint),
m_ResolveThread (nullptr), m_LocalSocket (nullptr), RemotePort (remotePort),
m_LastPort (0), m_cancel_resolve (false), m_Gzip (gzip), m_DatagramVersion (datagramVersion),
m_NextSendPacketNum (1), m_LastReceivedPacketNum (0), m_RTT (0)
m_NextSendPacketNum (1), m_LastReceivedPacketNum (0), m_RTT (0),
m_AckTimer (localDestination->GetService ()), m_AckTimerSeqn (0)
{
}
@ -341,6 +342,7 @@ namespace client
m_ResolveThread = nullptr;
}
m_RemoteAddr = nullptr;
m_AckTimer.cancel ();
}
void I2PUDPClientTunnel::RecvFromLocal ()
@ -390,8 +392,7 @@ namespace client
if (m_DatagramVersion == i2p::datagram::eDatagramV3)
{
uint8_t flags = 0;
if (!m_UnackedDatagrams.empty () && (ts > m_UnackedDatagrams.front ().second + I2P_UDP_MAX_UNACKED_DATAGRAM_TIME ||
m_NextSendPacketNum > m_UnackedDatagrams.front ().first + I2P_UDP_MAX_NUM_UNACKED_DATAGRAMS))
if (!m_UnackedDatagrams.empty () && m_NextSendPacketNum > m_UnackedDatagrams.front ().first + I2P_UDP_MAX_NUM_UNACKED_DATAGRAMS)
{
m_UnackedDatagrams.clear ();
session->DropSharedRoutingPath ();
@ -406,6 +407,7 @@ namespace client
if (flags)
options.Put (UDP_SESSION_FLAGS, flags);
m_LocalDest->GetDatagramDestination ()->SendDatagram (session, m_RecvBuff, transferred, remotePort, RemotePort, &options);
ScheduleAckTimer (m_NextSendPacketNum);
}
else
m_LocalDest->GetDatagramDestination ()->SendDatagram (session, m_RecvBuff, transferred, remotePort, RemotePort);
@ -527,6 +529,11 @@ namespace client
void I2PUDPClientTunnel::Acked (uint32_t seqn)
{
if (m_AckTimerSeqn && seqn >= m_AckTimerSeqn)
{
m_AckTimerSeqn = 0;
m_AckTimer.cancel ();
}
if (m_UnackedDatagrams.empty () && seqn < m_UnackedDatagrams.front ().first) return;
auto it = m_UnackedDatagrams.begin ();
while (it != m_UnackedDatagrams.end ())
@ -538,6 +545,30 @@ namespace client
}
m_UnackedDatagrams.erase (m_UnackedDatagrams.begin (), it);
}
void I2PUDPClientTunnel::ScheduleAckTimer (uint32_t seqn)
{
if (!m_AckTimerSeqn)
{
m_AckTimerSeqn = seqn;
m_AckTimer.expires_from_now (boost::posix_time::milliseconds (m_RTT ? 2*m_RTT : I2P_UDP_MAX_UNACKED_DATAGRAM_TIME));
m_AckTimer.async_wait ([this](const boost::system::error_code& ecode)
{
if (ecode != boost::asio::error::operation_aborted)
{
LogPrint (eLogInfo, "UDP Client: Packet ", m_AckTimerSeqn, " was not acked");
m_AckTimerSeqn = 0;
m_RTT = 0;
// send empty packet with reset path flag
i2p::util::Mapping options;
options.Put (UDP_SESSION_FLAGS, UDP_SESSION_FLAG_RESET_PATH);
auto session = GetDatagramSession ();
session->DropSharedRoutingPath ();
m_LocalDest->GetDatagramDestination ()->SendDatagram (session, nullptr, 0, 0, 0, &options);
}
});
}
}
}
}