CNetAddr source;
// last successful connection by us
- int64 nLastSuccess;
+ int64_t nLastSuccess;
// last try whatsoever by us:
- // int64 CAddress::nLastTry
+ // int64_t CAddress::nLastTry
// connection attempts since last successful attempt
int nAttempts;
}
// Determine whether the statistics about this entry are bad enough so that it can just be deleted
- bool IsTerrible(int64 nNow = GetAdjustedTime()) const;
+ bool IsTerrible(int64_t nNow = GetAdjustedTime()) const;
// Calculate the relative chance this entry should be given when selecting nodes to connect to
- double GetChance(int64 nNow = GetAdjustedTime()) const;
+ double GetChance(int64_t nNow = GetAdjustedTime()) const;
};
void MakeTried(CAddrInfo& info, int nId, int nOrigin);
// Mark an entry "good", possibly moving it from "new" to "tried".
- void Good_(const CService &addr, int64 nTime);
+ void Good_(const CService &addr, int64_t nTime);
// Add an entry to the "new" table.
- bool Add_(const CAddress &addr, const CNetAddr& source, int64 nTimePenalty);
+ bool Add_(const CAddress &addr, const CNetAddr& source, int64_t nTimePenalty);
// Mark an entry as attempted to connect.
- void Attempt_(const CService &addr, int64 nTime);
+ void Attempt_(const CService &addr, int64_t nTime);
// Select an address to connect to.
// nUnkBias determines how much to favor new addresses over tried ones (min=0, max=100)
// Select several addresses at once.
void GetAddr_(std::vector<CAddress> &vAddr);
+ void GetOnlineAddr_(std::vector<CAddrInfo> &vAddr);
// Mark an entry as currently-connected-to.
- void Connected_(const CService &addr, int64 nTime);
+ void Connected_(const CService &addr, int64_t nTime);
public:
+#ifndef _MSC_VER
IMPLEMENT_SERIALIZE
(({
// serialized format:
}
}
});)
+#else
+ IMPLEMENT_SERIALIZE
+ (
+ LOCK(cs);
+ unsigned char
+ nVersion = 0;
+
+ READWRITE(nVersion);
+ READWRITE(nKey);
+ READWRITE(nNew);
+ READWRITE(nTried);
+
+ CAddrMan
+ *am = const_cast<CAddrMan*>(this);
+
+ if (fWrite)
+ {
+ int
+ nUBuckets = ADDRMAN_NEW_BUCKET_COUNT;
+
+ READWRITE(nUBuckets);
+/************
+ std::map<int, int>
+ mapUnkIds;
+************/
+ int
+ nIds = 0;
+ for (std::map<int, CAddrInfo>::iterator it = am->mapInfo.begin(); it != am->mapInfo.end(); it++)
+ {
+ if (nIds == nNew)
+ break; // this means nNew was wrong, oh ow
+ mapUnkIds[(*it).first] = nIds;
+
+ CAddrInfo
+ &info = (*it).second;
+
+ if (info.nRefCount)
+ {
+ READWRITE(info);
+ nIds++;
+ }
+ }
+ nIds = 0;
+ for (std::map<int, CAddrInfo>::iterator it = am->mapInfo.begin(); it != am->mapInfo.end(); it++)
+ {
+ if (nIds == nTried)
+ break; /* this means nTried was wrong, oh ow */
+
+ CAddrInfo
+ &info = (*it).second;
+
+ if (info.fInTried)
+ {
+ READWRITE(info);
+ nIds++;
+ }
+ }
+ for (
+ std::vector<std::set<int> >::iterator it = am->vvNew.begin();
+ it != am->vvNew.end();
+ it++
+ )
+ {
+ std::set<int>
+ &vNew = (*it);
+
+ int
+ nSize = int( vNew.size() );
+
+ READWRITE(nSize);
+ for (std::set<int>::iterator it2 = vNew.begin(); it2 != vNew.end(); it2++)
+ {
+ int
+ nIndex = mapUnkIds[*it2];
+ READWRITE(nIndex);
+ }
+ }
+ }
+ else
+ {
+ int
+ nUBuckets = 0;
+
+ READWRITE(nUBuckets);
+ am->nIdCount = 0;
+ am->mapInfo.clear();
+ am->mapAddr.clear();
+ am->vRandom.clear();
+ am->vvTried =
+ std::vector<std::vector<int> >(
+ ADDRMAN_TRIED_BUCKET_COUNT,
+ std::vector<int>(0)
+ );
+ am->vvNew =
+ std::vector<std::set<int> >(
+ ADDRMAN_NEW_BUCKET_COUNT,
+ std::set<int>()
+ );
+ for (int n = 0; n < am->nNew; n++)
+ {
+ CAddrInfo
+ &info = am->mapInfo[n];
+
+ READWRITE(info);
+ am->mapAddr[info] = n;
+ info.nRandomPos = int( vRandom.size() );
+ am->vRandom.push_back(n);
+ if (nUBuckets != ADDRMAN_NEW_BUCKET_COUNT)
+ {
+ am->vvNew[info.GetNewBucket(am->nKey)].insert(n);
+ info.nRefCount++;
+ }
+ }
+ am->nIdCount = am->nNew;
+
+ int
+ nLost = 0;
+
+ for (int n = 0; n < am->nTried; n++)
+ {
+ CAddrInfo
+ info;
+
+ READWRITE(info);
+
+ std::vector<int>
+ &vTried = am->vvTried[info.GetTriedBucket(am->nKey)];
+
+ if (vTried.size() < ADDRMAN_TRIED_BUCKET_SIZE)
+ {
+ info.nRandomPos = int( vRandom.size() );
+ info.fInTried = true;
+ am->vRandom.push_back(am->nIdCount);
+ am->mapInfo[am->nIdCount] = info;
+ am->mapAddr[info] = am->nIdCount;
+ vTried.push_back(am->nIdCount);
+ am->nIdCount++;
+ }
+ else
+ {
+ nLost++;
+ }
+ }
+ am->nTried -= nLost;
+ for (int b = 0; b < nUBuckets; b++)
+ {
+ std::set<int>
+ &vNew = am->vvNew[b];
+ int
+ nSize = 0;
+
+ READWRITE(nSize);
+ for (int n = 0; n < nSize; n++)
+ {
+ int
+ nIndex = 0;
+
+ READWRITE(nIndex);
+
+ CAddrInfo
+ &info = am->mapInfo[nIndex];
+
+ if (
+ (nUBuckets == ADDRMAN_NEW_BUCKET_COUNT) &&
+ (info.nRefCount < ADDRMAN_NEW_BUCKETS_PER_ADDRESS)
+ )
+ {
+ info.nRefCount++;
+ vNew.insert(nIndex);
+ }
+ }
+ }
+ }
+ )
+
+#endif //_MSC_VER
CAddrMan() : vRandom(0), vvTried(ADDRMAN_TRIED_BUCKET_COUNT, std::vector<int>(0)), vvNew(ADDRMAN_NEW_BUCKET_COUNT, std::set<int>())
{
nKey.resize(32);
// Return the number of (unique) addresses in all tables.
int size()
{
- return vRandom.size();
+ return (int) vRandom.size();
}
// Consistency check
}
// Add a single address.
- bool Add(const CAddress &addr, const CNetAddr& source, int64 nTimePenalty = 0)
+ bool Add(const CAddress &addr, const CNetAddr& source, int64_t nTimePenalty = 0)
{
bool fRet = false;
{
}
// Add multiple addresses.
- bool Add(const std::vector<CAddress> &vAddr, const CNetAddr& source, int64 nTimePenalty = 0)
+ bool Add(const std::vector<CAddress> &vAddr, const CNetAddr& source, int64_t nTimePenalty = 0)
{
int nAdd = 0;
{
}
// Mark an entry as accessible.
- void Good(const CService &addr, int64 nTime = GetAdjustedTime())
+ void Good(const CService &addr, int64_t nTime = GetAdjustedTime())
{
{
LOCK(cs);
}
// Mark an entry as connection attempted to.
- void Attempt(const CService &addr, int64 nTime = GetAdjustedTime())
+ void Attempt(const CService &addr, int64_t nTime = GetAdjustedTime())
{
{
LOCK(cs);
return vAddr;
}
+ std::vector<CAddrInfo> GetOnlineAddr()
+ {
+ Check();
+ std::vector<CAddrInfo> vAddr;
+ {
+ LOCK(cs);
+ GetOnlineAddr_(vAddr);
+ }
+ Check();
+ return vAddr;
+ }
+
// Mark an entry as currently-connected-to.
- void Connected(const CService &addr, int64 nTime = GetAdjustedTime())
+ void Connected(const CService &addr, int64_t nTime = GetAdjustedTime())
{
{
LOCK(cs);
git://git.novaco.in / novacoin.git / blobdiff