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

don't lookup UDP session if port was not changed

Browse source
This commit is contained in:
orignal 2020-06-07 16:24:11 -04:00
parent 6735b2686b
commit 221c14cf0e
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libi2pd_client/I2PTunnel.cpp
View file

@ -634,7 +634,7 @@ namespace client
uint64_t now = i2p::util::GetMillisecondsSinceEpoch(); uint64_t now = i2p::util::GetMillisecondsSinceEpoch();
std::vector<uint16_t> removePorts; std::vector<uint16_t> removePorts;
for (const auto & s : m_Sessions) { for (const auto & s : m_Sessions) {
if (now - s.second.second >= delta) if (now - s.second->second >= delta)
removePorts.push_back(s.first); removePorts.push_back(s.first);
} }
for(auto port : removePorts) { for(auto port : removePorts) {
@ -761,7 +761,7 @@ namespace client
m_RemoteIdent(nullptr), m_RemoteIdent(nullptr),
m_ResolveThread(nullptr), m_ResolveThread(nullptr),
m_LocalSocket(localDestination->GetService(), localEndpoint), m_LocalSocket(localDestination->GetService(), localEndpoint),
RemotePort(remotePort), RemotePort(remotePort), m_LastPort (0),
m_cancel_resolve(false) m_cancel_resolve(false)
{ {
auto dgram = m_LocalDest->CreateDatagramDestination(gzip); auto dgram = m_LocalDest->CreateDatagramDestination(gzip);
@ -796,16 +796,24 @@ namespace client
return; // drop, remote not resolved return; // drop, remote not resolved
} }
auto remotePort = m_RecvEndpoint.port(); auto remotePort = m_RecvEndpoint.port();
auto itr = m_Sessions.find(remotePort); if (!m_LastPort || m_LastPort != remotePort)
if (itr == m_Sessions.end()) { {
// track new udp convo auto itr = m_Sessions.find(remotePort);
m_Sessions[remotePort] = {boost::asio::ip::udp::endpoint(m_RecvEndpoint), 0}; if (itr != m_Sessions.end())
} m_LastSession = itr->second;
else
{
m_LastSession = std::make_shared<UDPConvo>(boost::asio::ip::udp::endpoint(m_RecvEndpoint), 0);
m_Sessions.emplace (remotePort, m_LastSession);
}
m_LastPort = remotePort;
}
// send off to remote i2p destination // send off to remote i2p destination
LogPrint(eLogDebug, "UDP Client: send ", transferred, " to ", m_RemoteIdent->ToBase32(), ":", RemotePort); LogPrint(eLogDebug, "UDP Client: send ", transferred, " to ", m_RemoteIdent->ToBase32(), ":", RemotePort);
m_LocalDest->GetDatagramDestination()->SendDatagramTo(m_RecvBuff, transferred, *m_RemoteIdent, remotePort, RemotePort); m_LocalDest->GetDatagramDestination()->SendDatagramTo(m_RecvBuff, transferred, *m_RemoteIdent, remotePort, RemotePort);
// mark convo as active // mark convo as active
m_Sessions[remotePort].second = i2p::util::GetMillisecondsSinceEpoch(); if (m_LastSession)
m_LastSession->second = i2p::util::GetMillisecondsSinceEpoch();
RecvFromLocal(); RecvFromLocal();
} }
@ -851,9 +859,9 @@ namespace client
// found convo // found convo
if (len > 0) { if (len > 0) {
LogPrint(eLogDebug, "UDP Client: got ", len, "B from ", from.GetIdentHash().ToBase32()); LogPrint(eLogDebug, "UDP Client: got ", len, "B from ", from.GetIdentHash().ToBase32());
m_LocalSocket.send_to(boost::asio::buffer(buf, len), itr->second.first); m_LocalSocket.send_to(boost::asio::buffer(buf, len), itr->second->first);
// mark convo as active // mark convo as active
itr->second.second = i2p::util::GetMillisecondsSinceEpoch(); itr->second->second = i2p::util::GetMillisecondsSinceEpoch();
} }
} }
else else

5
libi2pd_client/I2PTunnel.h
View file

@ -276,7 +276,7 @@ namespace client
void TryResolving(); void TryResolving();
const std::string m_Name; const std::string m_Name;
std::mutex m_SessionsMutex; std::mutex m_SessionsMutex;
std::map<uint16_t, UDPConvo > m_Sessions; // maps i2p port -> local udp convo std::unordered_map<uint16_t, std::shared_ptr<UDPConvo> > m_Sessions; // maps i2p port -> local udp convo
const std::string m_RemoteDest; const std::string m_RemoteDest;
std::shared_ptr<i2p::client::ClientDestination> m_LocalDest; std::shared_ptr<i2p::client::ClientDestination> m_LocalDest;
const boost::asio::ip::udp::endpoint m_LocalEndpoint; const boost::asio::ip::udp::endpoint m_LocalEndpoint;
@ -285,8 +285,9 @@ namespace client
boost::asio::ip::udp::socket m_LocalSocket; boost::asio::ip::udp::socket m_LocalSocket;
boost::asio::ip::udp::endpoint m_RecvEndpoint; boost::asio::ip::udp::endpoint m_RecvEndpoint;
uint8_t m_RecvBuff[I2P_UDP_MAX_MTU]; uint8_t m_RecvBuff[I2P_UDP_MAX_MTU];
uint16_t RemotePort; uint16_t RemotePort, m_LastPort;
bool m_cancel_resolve; bool m_cancel_resolve;
std::shared_ptr<UDPConvo> m_LastSession;
}; };
class I2PServerTunnel: public I2PService class I2PServerTunnel: public I2PService