Merge pull request #3514

f59d8f0 Per-peer block download tracking and stalled download detection. (Pieter Wuille)
This commit is contained in:
Wladimir J. van der Laan
2014-03-10 13:22:29 +01:00
4 changed files with 131 additions and 29 deletions

View File

@@ -426,7 +426,7 @@ public:
LogPrint("net", "askfor %s %d (%s)\n", inv.ToString().c_str(), nRequestTime, DateTimeStrFormat("%H:%M:%S", nRequestTime/1000000).c_str());
// Make sure not to reuse time indexes to keep things in the same order
int64_t nNow = (GetTime() - 1) * 1000000;
int64_t nNow = GetTimeMicros() - 1000000;
static int64_t nLastTime;
++nLastTime;
nNow = std::max(nNow, nLastTime);