Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-10-17 17:20:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

save unacked seqn. handle acked option. calculate RTT
Some checks are pending
Build Debian packages / bookworm (push) Waiting to run
Details
Build Debian packages / bullseye (push) Waiting to run
Details
Build Debian packages / trixie (push) Waiting to run
Details
Build on FreeBSD / with UPnP (push) Waiting to run
Details
Build on OSX / With USE_UPNP=no (push) Waiting to run
Details
Build on OSX / With USE_UPNP=yes (push) Waiting to run
Details
Build on Windows / clang-x86_64 (push) Waiting to run
Details
Build on Windows / i686 (push) Waiting to run
Details
Build on Windows / ucrt-x86_64 (push) Waiting to run
Details
Build on Windows / x86_64 (push) Waiting to run
Details
Build on Windows / CMake clang-x86_64 (push) Waiting to run
Details
Build on Windows / CMake i686 (push) Waiting to run
Details
Build on Windows / CMake ucrt-x86_64 (push) Waiting to run
Details
Build on Windows / CMake x86_64 (push) Waiting to run
Details
Build on Windows / XP (push) Waiting to run
Details
Build on Ubuntu / Make with USE_UPNP=no (push) Waiting to run
Details
Build on Ubuntu / Make with USE_UPNP=yes (push) Waiting to run
Details
Build on Ubuntu / CMake with -DWITH_UPNP=OFF (push) Waiting to run
Details
Build on Ubuntu / CMake with -DWITH_UPNP=ON (push) Waiting to run
Details
Build containers / Building container for linux/amd64 (push) Waiting to run
Details
Build containers / Building container for linux/arm64 (push) Waiting to run
Details
Build containers / Building container for linux/arm/v7 (push) Waiting to run
Details
Build containers / Building container for linux/386 (push) Waiting to run
Details
Build containers / Pushing merged manifest (push) Blocked by required conditions
Details

Browse source
This commit is contained in:
orignal 2025-10-06 21:10:59 -04:00
parent edf488cbc3
commit cf48c205e1
2 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

37
libi2pd_client/UDPTunnel.cpp
View file

@ -38,10 +38,10 @@ namespace client
if (options->Get (UDP_SESSION_SEQN, seqn) && seqn > m_LastSession->m_LastReceivedPacketNum)
{
m_LastSession->m_LastReceivedPacketNum = seqn;
i2p::util::Mapping options;
options.Put (UDP_SESSION_ACKED, m_LastSession->m_LastReceivedPacketNum);
i2p::util::Mapping replyOptions;
replyOptions.Put (UDP_SESSION_ACKED, m_LastSession->m_LastReceivedPacketNum);
m_LastSession->m_Destination->SendDatagram(m_LastSession->GetDatagramSession (),
nullptr, 0, m_LastSession->LocalPort, m_LastSession->RemotePort, &options); // Ack only, no payload
nullptr, 0, m_LastSession->LocalPort, m_LastSession->RemotePort, &replyOptions); // Ack only, no payload
}
}
}
@ -277,7 +277,7 @@ 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_NextSendPacketNum (1), m_LastReceivedPacketNum (0), m_RTT (0)
{
}
@ -377,10 +377,13 @@ namespace client
auto ts = i2p::util::GetMillisecondsSinceEpoch ();
LogPrint (eLogDebug, "UDP Client: Send ", transferred, " to ", m_RemoteAddr->identHash.ToBase32 (), ":", RemotePort);
auto session = GetDatagramSession ();
if (ts > m_LastSession->second + I2P_UDP_REPLIABLE_DATAGRAM_INTERVAL)
uint64_t repliableDatagramInterval = I2P_UDP_REPLIABLE_DATAGRAM_INTERVAL;
if (m_RTT && m_RTT < I2P_UDP_REPLIABLE_DATAGRAM_INTERVAL*10) repliableDatagramInterval = m_RTT/10;
if (ts > m_LastSession->second + repliableDatagramInterval )
{
if (m_DatagramVersion == i2p::datagram::eDatagramV3)
{
m_UnackedDatagrams.push_back ({ m_NextSendPacketNum, ts });
i2p::util::Mapping options;
options.Put (UDP_SESSION_SEQN, m_NextSendPacketNum);
if (m_LastReceivedPacketNum > 0)
@ -467,11 +470,13 @@ namespace client
if (options->Get (UDP_SESSION_SEQN, seqn) && seqn > m_LastReceivedPacketNum)
{
m_LastReceivedPacketNum = seqn;
i2p::util::Mapping options;
options.Put (UDP_SESSION_ACKED, m_LastReceivedPacketNum);
i2p::util::Mapping replyOptions;
replyOptions.Put (UDP_SESSION_ACKED, m_LastReceivedPacketNum);
m_LocalDest->GetDatagramDestination ()->SendDatagram (GetDatagramSession (),
nullptr, 0, m_LastPort, RemotePort, &options); // Ack only, no payload
}
nullptr, 0, m_LastPort, RemotePort, &replyOptions); // Ack only, no payload
}
if (options->Get (UDP_SESSION_ACKED, seqn))
Acked (seqn);
}
if (len > 0)
HandleRecvFromI2PRaw (fromPort, toPort, buf, len);
@ -503,5 +508,19 @@ namespace client
LogPrint (eLogWarning, "UDP Client: Not tracking udp session using port ", (int) toPort);
}
void I2PUDPClientTunnel::Acked (uint32_t seqn)
{
if (m_UnackedDatagrams.empty () && seqn < m_UnackedDatagrams.front ().first) return;
auto it = m_UnackedDatagrams.begin ();
while (it != m_UnackedDatagrams.end ())
{
if (it->first > seqn) break;
if (it->first == seqn)
m_RTT = i2p::util::GetMillisecondsSinceEpoch () - it->second;
it++;
}
m_UnackedDatagrams.erase (m_UnackedDatagrams.begin (), it);
}
}
}