mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd synced 2024-09-19 18:00:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

don't select same peer too often

Browse Source
This commit is contained in:
orignal 2024-08-19 15:51:56 -04:00
parent 0df895b6a7
commit 3720a5fce3
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libi2pd/Transports.cpp
View File

@ -977,6 +977,7 @@ namespace transport
std::shared_ptr<const i2p::data::RouterInfo> Transports::GetRandomPeer (Filter filter) const std::shared_ptr<const i2p::data::RouterInfo> Transports::GetRandomPeer (Filter filter) const
{ {
if (m_Peers.empty()) return nullptr; if (m_Peers.empty()) return nullptr;
auto ts = i2p::util::GetSecondsSinceEpoch ();
bool found = false; bool found = false;
i2p::data::IdentHash ident; i2p::data::IdentHash ident;
{ {
@ -1017,9 +1018,11 @@ namespace transport
it = it1; it = it1;
while (it != it2 && it != m_Peers.end ()) while (it != it2 && it != m_Peers.end ())
{ {
if (filter (it->second)) if (ts > it->second->lastSelectionTime + PEER_SELECTION_MIN_INTERVAL &&
filter (it->second))
{ {
ident = it->first; ident = it->first;
it->second->lastSelectionTime = ts;
found = true; found = true;
break; break;
} }
@ -1031,9 +1034,11 @@ namespace transport
it = m_Peers.begin (); it = m_Peers.begin ();
while (it != it1 && it != m_Peers.end ()) while (it != it1 && it != m_Peers.end ())
{ {
if (filter (it->second)) if (ts > it->second->lastSelectionTime + PEER_SELECTION_MIN_INTERVAL &&
filter (it->second))
{ {
ident = it->first; ident = it->first;
it->second->lastSelectionTime = ts;
found = true; found = true;
break; break;
} }
@ -1045,9 +1050,11 @@ namespace transport
it = it2; it = it2;
while (it != m_Peers.end ()) while (it != m_Peers.end ())
{ {
if (filter (it->second)) if (ts > it->second->lastSelectionTime + PEER_SELECTION_MIN_INTERVAL &&
filter (it->second))
{ {
ident = it->first; ident = it->first;
it->second->lastSelectionTime = ts;
found = true; found = true;
break; break;
} }

5
libi2pd/Transports.h
View File

@ -64,12 +64,13 @@ namespace transport
const int PEER_ROUTER_INFO_UPDATE_INTERVAL = 31*60; // in seconds const int PEER_ROUTER_INFO_UPDATE_INTERVAL = 31*60; // in seconds
const int PEER_ROUTER_INFO_UPDATE_INTERVAL_VARIANCE = 7*60; // in seconds const int PEER_ROUTER_INFO_UPDATE_INTERVAL_VARIANCE = 7*60; // in seconds
const size_t PEER_ROUTER_INFO_OVERLOAD_QUEUE_SIZE = 25; const size_t PEER_ROUTER_INFO_OVERLOAD_QUEUE_SIZE = 25;
const int PEER_SELECTION_MIN_INTERVAL = 20; // in seconds
struct Peer struct Peer
{ {
int numAttempts; int numAttempts;
std::shared_ptr<const i2p::data::RouterInfo> router; std::shared_ptr<const i2p::data::RouterInfo> router;
std::list<std::shared_ptr<TransportSession> > sessions; std::list<std::shared_ptr<TransportSession> > sessions;
uint64_t creationTime, nextRouterInfoUpdateTime; uint64_t creationTime, nextRouterInfoUpdateTime, lastSelectionTime;
std::vector<std::shared_ptr<i2p::I2NPMessage> > delayedMessages; std::vector<std::shared_ptr<i2p::I2NPMessage> > delayedMessages;
std::vector<i2p::data::RouterInfo::SupportedTransports> priority; std::vector<i2p::data::RouterInfo::SupportedTransports> priority;
bool isHighBandwidth, isEligible; bool isHighBandwidth, isEligible;
@ -77,7 +78,7 @@ namespace transport
Peer (std::shared_ptr<const i2p::data::RouterInfo> r, uint64_t ts): Peer (std::shared_ptr<const i2p::data::RouterInfo> r, uint64_t ts):
numAttempts (0), router (r), creationTime (ts), numAttempts (0), router (r), creationTime (ts),
nextRouterInfoUpdateTime (ts + PEER_ROUTER_INFO_UPDATE_INTERVAL), nextRouterInfoUpdateTime (ts + PEER_ROUTER_INFO_UPDATE_INTERVAL),
isHighBandwidth (false), isEligible (false) lastSelectionTime (0), isHighBandwidth (false), isEligible (false)
{ {
UpdateParams (router); UpdateParams (router);
} }