twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-09 06:18:02 +00:00
Code Issues Projects Releases Wiki Activity

addrman corruption causes infinite-loop and twisterd shutdown hangs. try to fix this.

Browse Source
This commit is contained in:
Miguel Freitas 2015-12-20 21:37:57 -02:00
parent 4a8518f596
commit 7458d09166
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/addrman.cpp
View File

@ -405,7 +405,8 @@ CAddress CAddrMan::Select_(int nUnkBias)
{ {
// use a tried node // use a tried node
double fChanceFactor = 1.0; double fChanceFactor = 1.0;
while(1) int retries = 10000;
while(retries--)
{ {
int nKBucket = GetRandInt(vvTried.size()); int nKBucket = GetRandInt(vvTried.size());
std::vector<int> &vTried = vvTried[nKBucket]; std::vector<int> &vTried = vvTried[nKBucket];
@ -417,10 +418,19 @@ CAddress CAddrMan::Select_(int nUnkBias)
return info; return info;
fChanceFactor *= 1.2; fChanceFactor *= 1.2;
} }
// inconsistency?? try recounting nTried to fix it
printf("CAddrMan::Select_ nTried inconsistency - fixing\n");
nTried = 0;
for (int n=0; n<vvTried.size(); n++) {
nTried += vvTried[n].size();
}
return CAddress();
} else { } else {
// use a new node // use a new node
double fChanceFactor = 1.0; double fChanceFactor = 1.0;
while(1) int retries = 10000;
while(retries--)
{ {
int nUBucket = GetRandInt(vvNew.size()); int nUBucket = GetRandInt(vvNew.size());
std::set<int> &vNew = vvNew[nUBucket]; std::set<int> &vNew = vvNew[nUBucket];
@ -435,6 +445,14 @@ CAddress CAddrMan::Select_(int nUnkBias)
return info; return info;
fChanceFactor *= 1.2; fChanceFactor *= 1.2;
} }
// inconsistency?? try recounting nNew to fix it
printf("CAddrMan::Select_ nNew inconsistency - fixing\n");
nNew = 0;
for (int n=0; n<vvNew.size(); n++) {
nNew += vvNew[n].size();
}
return CAddress();
} }
} }