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

path reset flag for Datagram3
Some checks failed
Build Debian packages / bookworm (push) Has been cancelled
Details
Build Debian packages / bullseye (push) Has been cancelled
Details
Build Debian packages / trixie (push) Has been cancelled
Details
Build on FreeBSD / with UPnP (push) Has been cancelled
Details
Build on OSX / With USE_UPNP=no (push) Has been cancelled
Details
Build on OSX / With USE_UPNP=yes (push) Has been cancelled
Details
Build on Windows / clang-x86_64 (push) Has been cancelled
Details
Build on Windows / i686 (push) Has been cancelled
Details
Build on Windows / ucrt-x86_64 (push) Has been cancelled
Details
Build on Windows / x86_64 (push) Has been cancelled
Details
Build on Windows / CMake clang-x86_64 (push) Has been cancelled
Details
Build on Windows / CMake i686 (push) Has been cancelled
Details
Build on Windows / CMake ucrt-x86_64 (push) Has been cancelled
Details
Build on Windows / CMake x86_64 (push) Has been cancelled
Details
Build on Windows / XP (push) Has been cancelled
Details
Build on Ubuntu / Make with USE_UPNP=no (push) Has been cancelled
Details
Build on Ubuntu / Make with USE_UPNP=yes (push) Has been cancelled
Details
Build on Ubuntu / CMake with -DWITH_UPNP=OFF (push) Has been cancelled
Details
Build on Ubuntu / CMake with -DWITH_UPNP=ON (push) Has been cancelled
Details
Build containers / Building container for linux/amd64 (push) Has been cancelled
Details
Build containers / Building container for linux/arm64 (push) Has been cancelled
Details
Build containers / Building container for linux/arm/v7 (push) Has been cancelled
Details
Build containers / Building container for linux/386 (push) Has been cancelled
Details
Build containers / Pushing merged manifest (push) Has been cancelled
Details

Browse source
This commit is contained in:
orignal 2025-10-08 13:28:02 -04:00
parent da399054c0
commit d10a7fe8e5
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libi2pd_client/UDPTunnel.cpp
View file

@ -19,6 +19,9 @@ namespace client
{ {
constexpr std::string_view UDP_SESSION_SEQN { "seqn" }; constexpr std::string_view UDP_SESSION_SEQN { "seqn" };
constexpr std::string_view UDP_SESSION_ACKED { "acked" }; constexpr std::string_view UDP_SESSION_ACKED { "acked" };
constexpr std::string_view UDP_SESSION_FLAGS { "flags" };
constexpr uint8_t UDP_SESSION_FLAG_RESET_PATH = 0x01;
void I2PUDPServerTunnel::HandleRecvFromI2P(const i2p::data::IdentityEx& from, uint16_t fromPort, uint16_t toPort, void I2PUDPServerTunnel::HandleRecvFromI2P(const i2p::data::IdentityEx& from, uint16_t fromPort, uint16_t toPort,
const uint8_t * buf, size_t len, const i2p::util::Mapping * options) const uint8_t * buf, size_t len, const i2p::util::Mapping * options)
@ -34,6 +37,9 @@ namespace client
LogPrint (eLogInfo, "UDP Server: Send exception: ", ec.message (), " to ", m_RemoteEndpoint); LogPrint (eLogInfo, "UDP Server: Send exception: ", ec.message (), " to ", m_RemoteEndpoint);
if (options) if (options)
{ {
uint8_t flags = 0;
if (options->Get (UDP_SESSION_FLAGS, flags) && (flags & UDP_SESSION_FLAG_RESET_PATH))
m_LastSession->GetDatagramSession ()->DropSharedRoutingPath ();
uint32_t seqn = 0; uint32_t seqn = 0;
if (options->Get (UDP_SESSION_SEQN, seqn) && seqn > m_LastSession->m_LastReceivedPacketNum) if (options->Get (UDP_SESSION_SEQN, seqn) && seqn > m_LastSession->m_LastReceivedPacketNum)
{ {
@ -42,7 +48,7 @@ namespace client
replyOptions.Put (UDP_SESSION_ACKED, m_LastSession->m_LastReceivedPacketNum); replyOptions.Put (UDP_SESSION_ACKED, m_LastSession->m_LastReceivedPacketNum);
m_LastSession->m_Destination->SendDatagram(m_LastSession->GetDatagramSession (), m_LastSession->m_Destination->SendDatagram(m_LastSession->GetDatagramSession (),
nullptr, 0, m_LastSession->LocalPort, m_LastSession->RemotePort, &replyOptions); // Ack only, no payload nullptr, 0, m_LastSession->LocalPort, m_LastSession->RemotePort, &replyOptions); // Ack only, no payload
} }
} }
} }
@ -383,17 +389,22 @@ namespace client
{ {
if (m_DatagramVersion == i2p::datagram::eDatagramV3) 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 || 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)) m_NextSendPacketNum > m_UnackedDatagrams.front ().first + I2P_UDP_MAX_NUM_UNACKED_DATAGRAMS))
{ {
m_UnackedDatagrams.clear (); m_UnackedDatagrams.clear ();
session->DropSharedRoutingPath (); session->DropSharedRoutingPath ();
m_RTT = 0;
flags |= UDP_SESSION_FLAG_RESET_PATH;
} }
m_UnackedDatagrams.push_back ({ m_NextSendPacketNum, ts }); m_UnackedDatagrams.push_back ({ m_NextSendPacketNum, ts });
i2p::util::Mapping options; i2p::util::Mapping options;
options.Put (UDP_SESSION_SEQN, m_NextSendPacketNum); options.Put (UDP_SESSION_SEQN, m_NextSendPacketNum);
if (m_LastReceivedPacketNum > 0) if (m_LastReceivedPacketNum > 0)
options.Put (UDP_SESSION_ACKED, m_LastReceivedPacketNum); options.Put (UDP_SESSION_ACKED, m_LastReceivedPacketNum);
if (flags)
options.Put (UDP_SESSION_FLAGS, flags);
m_LocalDest->GetDatagramDestination ()->SendDatagram (session, m_RecvBuff, transferred, remotePort, RemotePort, &options); m_LocalDest->GetDatagramDestination ()->SendDatagram (session, m_RecvBuff, transferred, remotePort, RemotePort, &options);
} }
else else