// CAddrDB
//
-bool CAddrDB::WriteAddress(const CAddress& addr)
-{
- return Write(make_pair(string("addr"), addr.GetKey()), addr);
-}
-
bool CAddrDB::WriteAddrman(const CAddrMan& addrman)
{
return Write(string("addrman"), addrman);
}
-bool CAddrDB::EraseAddress(const CAddress& addr)
-{
- return Erase(make_pair(string("addr"), addr.GetKey()));
-}
-
-bool CAddrDB::LoadAddresses(bool &fUpdate)
+bool CAddrDB::LoadAddresses()
{
bool fAddrMan = false;
if (Read(string("addrman"), addrman))
}
vector<CAddress> vAddr;
+ vector<vector<unsigned char> > vDelete;
// Get cursor
Dbc* pcursor = GetCursor();
if (strType == "addr")
{
if (fAddrMan)
- fUpdate = true;
+ {
+ vector<unsigned char> vchKey;
+ ssKey >> vchKey;
+ vDelete.push_back(vchKey);
+ }
else
{
CAddress addr;
}
pcursor->close();
+ BOOST_FOREACH(const vector<unsigned char> &vchKey, vDelete)
+ Erase(make_pair(string("addr"), vchKey));
+
if (!fAddrMan)
{
addrman.Add(vAddr, CNetAddr("0.0.0.0"));
bool LoadAddresses()
{
- bool fUpdate = false;
- bool fRet = CAddrDB("cr+").LoadAddresses(fUpdate);
- if (fUpdate)
- CDB::Rewrite("addr.dat", "\004addr");
- return fRet;
+ return CAddrDB("cr+").LoadAddresses();
}
CAddrDB(const CAddrDB&);
void operator=(const CAddrDB&);
public:
- bool WriteAddress(const CAddress& addr);
- bool EraseAddress(const CAddress& addr);
bool WriteAddrman(const CAddrMan& addr);
- bool LoadAddresses(bool &fUpdate);
+ bool LoadAddresses();
};
bool LoadAddresses();