diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2013-11-01 01:00:37 +0100 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2013-11-01 01:07:49 +0100 |
| commit | 1dffbf0060912674df2b045de1c2f3691787298a (patch) | |
| tree | b56d0e7ff47f434f7fd3799f9b0777bd6e12d917 /src/main.cpp | |
| parent | ede3ee3348ecaeed04dec587171e732ebc0830fd (diff) | |
| parent | a616206865d62106944300d7b912e3af8d357610 (diff) | |
| download | bitcoin-1dffbf0060912674df2b045de1c2f3691787298a.tar.xz | |
Merge pull request #3114
a616206 Give peer time-adjustment data an own lock (Pieter Wuille)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 640fbac8bb..875cd67341 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -49,7 +49,7 @@ int64 CTransaction::nMinTxFee = 10000; // Override with -mintxfee /** Fees smaller than this (in satoshi) are considered zero fee (for relaying) */ int64 CTransaction::nMinRelayTxFee = 10000; -CMedianFilter<int> cPeerBlockCounts(8, 0); // Amount of blocks that other nodes claim to have +static CMedianFilter<int> cPeerBlockCounts(8, 0); // Amount of blocks that other nodes claim to have map<uint256, CBlock*> mapOrphanBlocks; multimap<uint256, CBlock*> mapOrphanBlocksByPrev; @@ -3396,8 +3396,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) LogPrintf("receive version message: version %d, blocks=%d, us=%s, them=%s, peer=%s\n", pfrom->nVersion, pfrom->nStartingHeight, addrMe.ToString().c_str(), addrFrom.ToString().c_str(), pfrom->addr.ToString().c_str()); - LOCK(cs_main); AddTimeData(pfrom->addr, nTime); + + LOCK(cs_main); cPeerBlockCounts.input(pfrom->nStartingHeight); } |