sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 04:52:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'deladdr' of https://github.com/sipa/bitcoin

Browse Source
This commit is contained in:
Gavin Andresen 2012-03-26 14:32:26 -04:00
commit bf5b80a8ae
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/db.cpp
View File

@ -714,22 +714,12 @@ bool CTxDB::LoadBlockIndex()
// CAddrDB // CAddrDB
// //
bool CAddrDB::WriteAddress(const CAddress& addr)
{
return Write(make_pair(string("addr"), addr.GetKey()), addr);
}
bool CAddrDB::WriteAddrman(const CAddrMan& addrman) bool CAddrDB::WriteAddrman(const CAddrMan& addrman)
{ {
return Write(string("addrman"), addrman); return Write(string("addrman"), addrman);
} }
bool CAddrDB::EraseAddress(const CAddress& addr) bool CAddrDB::LoadAddresses()
{
return Erase(make_pair(string("addr"), addr.GetKey()));
}
bool CAddrDB::LoadAddresses(bool &fUpdate)
{ {
bool fAddrMan = false; bool fAddrMan = false;
if (Read(string("addrman"), addrman)) if (Read(string("addrman"), addrman))
@ -739,6 +729,7 @@ bool CAddrDB::LoadAddresses(bool &fUpdate)
} }
vector<CAddress> vAddr; vector<CAddress> vAddr;
vector<vector<unsigned char> > vDelete;
// Get cursor // Get cursor
Dbc* pcursor = GetCursor(); Dbc* pcursor = GetCursor();
@ -762,7 +753,11 @@ bool CAddrDB::LoadAddresses(bool &fUpdate)
if (strType == "addr") if (strType == "addr")
{ {
if (fAddrMan) if (fAddrMan)
fUpdate = true; {
vector<unsigned char> vchKey;
ssKey >> vchKey;
vDelete.push_back(vchKey);
}
else else
{ {
CAddress addr; CAddress addr;
@ -774,6 +769,9 @@ bool CAddrDB::LoadAddresses(bool &fUpdate)
} }
pcursor->close(); pcursor->close();
BOOST_FOREACH(const vector<unsigned char> &vchKey, vDelete)
Erase(make_pair(string("addr"), vchKey));
if (!fAddrMan) if (!fAddrMan)
{ {
addrman.Add(vAddr, CNetAddr("0.0.0.0")); addrman.Add(vAddr, CNetAddr("0.0.0.0"));
@ -785,11 +783,7 @@ bool CAddrDB::LoadAddresses(bool &fUpdate)
bool LoadAddresses() bool LoadAddresses()
{ {
bool fUpdate = false; return CAddrDB("cr+").LoadAddresses();
bool fRet = CAddrDB("cr+").LoadAddresses(fUpdate);
if (fUpdate)
CDB::Rewrite("addr.dat", "\004addr");
return fRet;
} }

4
src/db.h
View File

@ -306,10 +306,8 @@ private:
CAddrDB(const CAddrDB&); CAddrDB(const CAddrDB&);
void operator=(const CAddrDB&); void operator=(const CAddrDB&);
public: public:
bool WriteAddress(const CAddress& addr);
bool EraseAddress(const CAddress& addr);
bool WriteAddrman(const CAddrMan& addr); bool WriteAddrman(const CAddrMan& addr);
bool LoadAddresses(bool &fUpdate); bool LoadAddresses();
}; };
bool LoadAddresses(); bool LoadAddresses();