X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Faddrman.cpp;h=f24e7e78202c89d64b4a6354ce6ebd65e2832215;hb=32b53bb54ee7591fd47dd1ee24e05b73337f40b5;hp=ba62a00ec211944bbd7c8a759734a9397bd38904;hpb=ee4e1c59d2f59211f7389c36482a39d79f573fb2;p=novacoin.git diff --git a/src/addrman.cpp b/src/addrman.cpp index ba62a00..f24e7e7 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -43,13 +43,13 @@ bool CAddrInfo::IsTerrible(int64_t nNow) const if (nTime > nNow + 10*60) // came in a flying DeLorean return true; - if (nTime==0 || nNow-nTime > ADDRMAN_HORIZON_DAYS*86400) // not seen in over a month + if (nTime==0 || nNow-nTime > ADDRMAN_HORIZON_DAYS*nOneDay) // not seen in over a month return true; if (nLastSuccess==0 && nAttempts>=ADDRMAN_RETRIES) // tried three times and never a success return true; - if (nNow-nLastSuccess > ADDRMAN_MIN_FAIL_DAYS*86400 && nAttempts>=ADDRMAN_MAX_FAILURES) // 10 successive failures in the last week + if (nNow-nLastSuccess > ADDRMAN_MIN_FAIL_DAYS*nOneDay && nAttempts>=ADDRMAN_MAX_FAILURES) // 10 successive failures in the last week return true; return false; @@ -322,8 +322,8 @@ bool CAddrMan::Add_(const CAddress &addr, const CNetAddr& source, int64_t nTimeP if (pinfo) { // periodically update nTime - bool fCurrentlyOnline = (GetAdjustedTime() - addr.nTime < 24 * 60 * 60); - int64_t nUpdateInterval = (fCurrentlyOnline ? 60 * 60 : 24 * 60 * 60); + bool fCurrentlyOnline = (GetAdjustedTime() - addr.nTime < nOneDay); + int64_t nUpdateInterval = (fCurrentlyOnline ? nOneHour : nOneDay); if (addr.nTime && (!pinfo->nTime || pinfo->nTime < addr.nTime - nUpdateInterval - nTimePenalty)) pinfo->nTime = max((int64_t)0, addr.nTime - nTimePenalty); @@ -398,7 +398,7 @@ CAddress CAddrMan::Select_(int nUnkBias) { // use a tried node double fChanceFactor = 1.0; - while(1) + for ( ; ; ) { int nKBucket = GetRandInt(vvTried.size()); std::vector &vTried = vvTried[nKBucket]; @@ -413,7 +413,7 @@ CAddress CAddrMan::Select_(int nUnkBias) } else { // use a new node double fChanceFactor = 1.0; - while(1) + for ( ; ; ) { int nUBucket = GetRandInt(vvNew.size()); std::set &vNew = vvNew[nUBucket]; @@ -512,7 +512,7 @@ void CAddrMan::GetOnlineAddr_(std::vector &vAddr) for (std::map::const_iterator it = mapInfo.begin(); it != mapInfo.end(); it++) { CAddrInfo addr = it->second; - bool fCurrentlyOnline = (GetAdjustedTime() - addr.nTime < 24 * 60 * 60); + bool fCurrentlyOnline = (GetAdjustedTime() - addr.nTime < nOneDay); if (fCurrentlyOnline) vAddr.push_back(addr); }