BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1008 from gavinandresen/addrworkaround 

Workaround hangs when upgrading old addr.dat files
This commit is contained in:
Gavin Andresen 2012-03-29 12:10:08 -07:00
parent 83e914c1d5 6293a9f87f
commit dac1888c18
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/db.cpp
View File

@ -722,12 +722,13 @@ bool CAddrDB::WriteAddrman(const CAddrMan& addrman)
bool CAddrDB::LoadAddresses() bool CAddrDB::LoadAddresses()
{ {
bool fAddrMan = false;
if (Read(string("addrman"), addrman)) if (Read(string("addrman"), addrman))
{ {
printf("Loaded %i addresses\n", addrman.size()); printf("Loaded %i addresses\n", addrman.size());
fAddrMan = true; return true;
} }
// Read pre-0.6 addr records
vector<CAddress> vAddr; vector<CAddress> vAddr;
vector<vector<unsigned char> > vDelete; vector<vector<unsigned char> > vDelete;
@ -753,31 +754,19 @@ bool CAddrDB::LoadAddresses()
ssKey >> strType; ssKey >> strType;
if (strType == "addr") if (strType == "addr")
{ {
if (fAddrMan) CAddress addr;
{ ssValue >> addr;
vector<unsigned char> vchKey; vAddr.push_back(addr);
ssKey >> vchKey;
vDelete.push_back(vchKey);
}
else
{
CAddress addr;
ssValue >> addr;
vAddr.push_back(addr);
}
} }
} }
pcursor->close(); pcursor->close();
BOOST_FOREACH(const vector<unsigned char> &vchKey, vDelete) addrman.Add(vAddr, CNetAddr("0.0.0.0"));
Erase(make_pair(string("addr"), vchKey)); printf("Loaded %i addresses\n", addrman.size());
if (!fAddrMan) // Note: old records left; we ran into hangs-on-startup
{ // bugs for some users who (we think) were running after
addrman.Add(vAddr, CNetAddr("0.0.0.0")); // an unclean shutdown.
printf("Loaded %i addresses\n", addrman.size());
}
return true; return true;
} }