PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 08:14:15 +00:00
Code Issues Releases Activity

try routers before random router

Browse Source
This commit is contained in:
orignal 2021-07-27 18:35:30 -04:00
parent 513493fa78
commit e68cff8bba
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libi2pd/NetDb.cpp
View File

@ -1230,25 +1230,38 @@ namespace data
// try random router // try random router
if (it != m_RouterInfos.end () && !it->second->IsUnreachable () && filter (it->second)) if (it != m_RouterInfos.end () && !it->second->IsUnreachable () && filter (it->second))
return it->second; return it->second;
// try closest routers // try routers after
auto it1 = it; it1++; auto it1 = it; it1++;
// forward
while (it1 != m_RouterInfos.end ()) while (it1 != m_RouterInfos.end ())
{ {
if (!it1->second->IsUnreachable () && filter (it1->second)) if (!it1->second->IsUnreachable () && filter (it1->second))
return it1->second; return it1->second;
it1++; it1++;
} }
// still not found, try from the beginning // still not found, try some routers before
if (ind) if (ind)
{ {
ind = rand () % ind;
it1 = m_RouterInfos.begin (); it1 = m_RouterInfos.begin ();
while (it1 != it && it1 != m_RouterInfos.end ()) std::advance (it1, ind);
auto it2 = it1;
while (it2 != it && it2 != m_RouterInfos.end ())
{ {
if (!it1->second->IsUnreachable () && filter (it1->second)) if (!it2->second->IsUnreachable () && filter (it2->second))
return it1->second; return it2->second;
it1++; it2++;
} }
if (ind)
{
// still not found, try from the begining
it2 = m_RouterInfos.begin ();
while (it2 != it1 && it2 != m_RouterInfos.end ())
{
if (!it2->second->IsUnreachable () && filter (it2->second))
return it2->second;
it2++;
}
}
} }
return nullptr; // seems we have too few routers return nullptr; // seems we have too few routers