diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-05-05 21:22:55 +0200 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-05-06 19:58:22 -0400 |
| commit | 05ff9680baed281e00e2a0cab43d1d9ef17ec891 (patch) | |
| tree | 17a1f0e1c7dff72fa4748c1b6fd44067ee69f115 | |
| parent | dfdaee931021618fa2d280907aad7393640f39f5 (diff) | |
| download | bitcoin-05ff9680baed281e00e2a0cab43d1d9ef17ec891.tar.xz | |
Fix addrman crashes
A function returned the element to remove from a bucket, instead of its
position in that bucket. This function was only called when a tried
bucket overflowed, which only happens after many outgoing connections
have been made.
Closes: #1065, #1156
| -rw-r--r-- | src/addrman.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/addrman.cpp b/src/addrman.cpp index c1a0df6a44..10d005aae9 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -130,6 +130,7 @@ int CAddrMan::SelectTried(int nKBucket) // random shuffle the first few elements (using the entire list) // find the least recently tried among them int64 nOldest = -1; + int nOldestPos = -1; for (unsigned int i = 0; i < ADDRMAN_TRIED_ENTRIES_INSPECT_ON_EVICT && i < vTried.size(); i++) { int nPos = GetRandInt(vTried.size() - i) + i; @@ -137,11 +138,13 @@ int CAddrMan::SelectTried(int nKBucket) vTried[nPos] = vTried[i]; vTried[i] = nTemp; assert(nOldest == -1 || mapInfo.count(nTemp) == 1); - if (nOldest == -1 || mapInfo[nTemp].nLastSuccess < mapInfo[nOldest].nLastSuccess) + if (nOldest == -1 || mapInfo[nTemp].nLastSuccess < mapInfo[nOldest].nLastSuccess) { nOldest = nTemp; + nOldestPos = nPos; + } } - return nOldest; + return nOldestPos; } int CAddrMan::ShrinkNew(int nUBucket) |