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

send options with datagram3 only
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-02 21:16:54 -04:00
parent ba2cfe58bc
commit fd012fa3b7
1 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libi2pd_client/UDPTunnel.cpp
View file

@ -165,11 +165,16 @@ namespace client
auto session = GetDatagramSession (); auto session = GetDatagramSession ();
if (ts > LastActivity + I2P_UDP_REPLIABLE_DATAGRAM_INTERVAL) if (ts > LastActivity + I2P_UDP_REPLIABLE_DATAGRAM_INTERVAL)
{ {
i2p::util::Mapping options; if (session->GetVersion () == i2p::datagram::eDatagramV3)
options.Put (UDP_SESSION_SEQN, m_NextSendPacketNum); {
if (m_LastReceivedPacketNum > 0) i2p::util::Mapping options;
options.Put (UDP_SESSION_ACKED, m_LastReceivedPacketNum); options.Put (UDP_SESSION_SEQN, m_NextSendPacketNum);
m_Destination->SendDatagram(session, m_Buffer, len, LocalPort, RemotePort, &options); if (m_LastReceivedPacketNum > 0)
options.Put (UDP_SESSION_ACKED, m_LastReceivedPacketNum);
m_Destination->SendDatagram(session, m_Buffer, len, LocalPort, RemotePort, &options);
}
else
m_Destination->SendDatagram(session, m_Buffer, len, LocalPort, RemotePort);
} }
else else
m_Destination->SendRawDatagram(session, m_Buffer, len, LocalPort, RemotePort); m_Destination->SendRawDatagram(session, m_Buffer, len, LocalPort, RemotePort);
@ -374,11 +379,16 @@ namespace client
auto session = GetDatagramSession (); auto session = GetDatagramSession ();
if (ts > m_LastSession->second + I2P_UDP_REPLIABLE_DATAGRAM_INTERVAL) if (ts > m_LastSession->second + I2P_UDP_REPLIABLE_DATAGRAM_INTERVAL)
{ {
i2p::util::Mapping options; if (m_DatagramVersion == i2p::datagram::eDatagramV3)
options.Put (UDP_SESSION_SEQN, m_NextSendPacketNum); {
if (m_LastReceivedPacketNum > 0) i2p::util::Mapping options;
options.Put (UDP_SESSION_ACKED, m_LastReceivedPacketNum); options.Put (UDP_SESSION_SEQN, m_NextSendPacketNum);
m_LocalDest->GetDatagramDestination ()->SendDatagram (session, m_RecvBuff, transferred, remotePort, RemotePort, &options); if (m_LastReceivedPacketNum > 0)
options.Put (UDP_SESSION_ACKED, m_LastReceivedPacketNum);
m_LocalDest->GetDatagramDestination ()->SendDatagram (session, m_RecvBuff, transferred, remotePort, RemotePort, &options);
}
else
m_LocalDest->GetDatagramDestination ()->SendDatagram (session, m_RecvBuff, transferred, remotePort, RemotePort);
} }
else else
m_LocalDest->GetDatagramDestination ()->SendRawDatagram (session, m_RecvBuff, transferred, remotePort, RemotePort); m_LocalDest->GetDatagramDestination ()->SendRawDatagram (session, m_RecvBuff, transferred, remotePort, RemotePort);