exclude hidden routers from tunnels

This commit is contained in:
orignal 2014-06-18 10:41:59 -04:00
parent ebd64c9337
commit b95caaf219
4 changed files with 12 additions and 7 deletions

View file

@ -633,7 +633,7 @@ namespace data
}
}
const RouterInfo * NetDb::GetRandomRouter (const RouterInfo * compatibleWith, uint8_t caps) const
const RouterInfo * NetDb::GetRandomRouter (const RouterInfo * compatibleWith) const
{
CryptoPP::RandomNumberGenerator& rnd = i2p::context.GetRandomNumberGenerator ();
uint32_t ind = rnd.GenerateWord32 (0, m_RouterInfos.size () - 1);
@ -644,9 +644,8 @@ namespace data
{
if (i >= ind)
{
if (!it.second->IsUnreachable () &&
(!compatibleWith || it.second->IsCompatible (*compatibleWith)) &&
(!caps || (it.second->GetCaps () & caps) == caps))
if (!it.second->IsUnreachable () && !it.second->IsHidden () &&
(!compatibleWith || it.second->IsCompatible (*compatibleWith)))
return it.second;
}
else