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

save datagram session between sending datagrams

Browse source
This commit is contained in:
orignal 2025-10-02 14:18:00 -04:00
parent fffb68c5e0
commit 73bf24e897
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libi2pd_client/UDPTunnel.cpp
View file

@ -35,10 +35,7 @@ namespace client
{ {
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)
{
m_LastSession->m_LastReceivedPacketNum = seqn; m_LastSession->m_LastReceivedPacketNum = seqn;
LogPrint (eLogDebug, "UDP Server: Received packet with seqn ", seqn);
}
} }
} }
@ -158,7 +155,12 @@ namespace client
{ {
LogPrint(eLogDebug, "UDPSession: Forward ", len, "B from ", FromEndpoint); LogPrint(eLogDebug, "UDPSession: Forward ", len, "B from ", FromEndpoint);
auto ts = i2p::util::GetMillisecondsSinceEpoch(); auto ts = i2p::util::GetMillisecondsSinceEpoch();
auto session = m_Destination->GetSession (Identity); auto session = m_LastDatagramSession.lock ();
if (!session)
{
session = m_Destination->GetSession (Identity);
m_LastDatagramSession = session;
}
if (ts > LastActivity + I2P_UDP_REPLIABLE_DATAGRAM_INTERVAL) if (ts > LastActivity + I2P_UDP_REPLIABLE_DATAGRAM_INTERVAL)
{ {
i2p::util::Mapping options; i2p::util::Mapping options;
@ -356,7 +358,12 @@ namespace client
// send off to remote i2p destination // send off to remote i2p destination
auto ts = i2p::util::GetMillisecondsSinceEpoch (); auto ts = i2p::util::GetMillisecondsSinceEpoch ();
LogPrint (eLogDebug, "UDP Client: Send ", transferred, " to ", m_RemoteAddr->identHash.ToBase32 (), ":", RemotePort); LogPrint (eLogDebug, "UDP Client: Send ", transferred, " to ", m_RemoteAddr->identHash.ToBase32 (), ":", RemotePort);
auto session = m_LocalDest->GetDatagramDestination ()->GetSession (m_RemoteAddr->identHash); auto session = m_LastDatagramSession.lock ();
if (!session)
{
session = m_LocalDest->GetDatagramDestination ()->GetSession (m_RemoteAddr->identHash);
m_LastDatagramSession = session;
}
if (ts > m_LastSession->second + I2P_UDP_REPLIABLE_DATAGRAM_INTERVAL) if (ts > m_LastSession->second + I2P_UDP_REPLIABLE_DATAGRAM_INTERVAL)
{ {
i2p::util::Mapping options; i2p::util::Mapping options;
@ -424,7 +431,15 @@ namespace client
const uint8_t * buf, size_t len, const i2p::util::Mapping * options) const uint8_t * buf, size_t len, const i2p::util::Mapping * options)
{ {
if (m_RemoteAddr && from.GetIdentHash() == m_RemoteAddr->identHash) if (m_RemoteAddr && from.GetIdentHash() == m_RemoteAddr->identHash)
{
if (options)
{
uint32_t seqn = 0;
if (options->Get (UDP_SESSION_SEQN, seqn) && seqn > m_LastReceivedPacketNum)
m_LastReceivedPacketNum = seqn;
}
HandleRecvFromI2PRaw (fromPort, toPort, buf, len); HandleRecvFromI2PRaw (fromPort, toPort, buf, len);
}
else else
LogPrint(eLogWarning, "UDP Client: Unwarranted traffic from ", from.GetIdentHash().ToBase32 ()); LogPrint(eLogWarning, "UDP Client: Unwarranted traffic from ", from.GetIdentHash().ToBase32 ());
} }

2
libi2pd_client/UDPTunnel.h
View file

@ -36,6 +36,7 @@ namespace client
struct UDPSession struct UDPSession
{ {
i2p::datagram::DatagramDestination * m_Destination; i2p::datagram::DatagramDestination * m_Destination;
std::weak_ptr<i2p::datagram::DatagramSession> m_LastDatagramSession;
boost::asio::ip::udp::socket IPSocket; boost::asio::ip::udp::socket IPSocket;
i2p::data::IdentHash Identity; i2p::data::IdentHash Identity;
boost::asio::ip::udp::endpoint FromEndpoint; boost::asio::ip::udp::endpoint FromEndpoint;
@ -181,6 +182,7 @@ namespace client
bool m_Gzip; bool m_Gzip;
i2p::datagram::DatagramVersion m_DatagramVersion; i2p::datagram::DatagramVersion m_DatagramVersion;
std::shared_ptr<UDPConvo> m_LastSession; std::shared_ptr<UDPConvo> m_LastSession;
std::weak_ptr<i2p::datagram::DatagramSession> m_LastDatagramSession;
uint32_t m_NextSendPacketNum, m_LastReceivedPacketNum; uint32_t m_NextSendPacketNum, m_LastReceivedPacketNum;
public: public: