Merge pull request #6028

1d5b47a nLastTry is only used for addrman entries (Pieter Wuille)
This commit is contained in:
Wladimir J. van der Laan
2015-04-24 15:51:54 +02:00
5 changed files with 10 additions and 13 deletions

View File

@@ -331,10 +331,10 @@ void CAddrMan::Attempt_(const CService& addr, int64_t nTime)
info.nAttempts++;
}
CAddress CAddrMan::Select_()
CAddrInfo CAddrMan::Select_()
{
if (size() == 0)
return CAddress();
return CAddrInfo();
// Use a 50% chance for choosing between tried and new table entries.
if (nTried > 0 && (nNew == 0 || GetRandInt(2) == 0)) {