From a616206865d62106944300d7b912e3af8d357610 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Sat, 19 Oct 2013 15:55:08 +0200 Subject: Give peer time-adjustment data an own lock Instead of relying on cs_main (defined in a different module) to prevent concurrent access to it. --- src/main.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 01a1babc7f..ca58d93133 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 cPeerBlockCounts(8, 0); // Amount of blocks that other nodes claim to have +static CMedianFilter cPeerBlockCounts(8, 0); // Amount of blocks that other nodes claim to have map mapOrphanBlocks; multimap mapOrphanBlocksByPrev; @@ -3460,8 +3460,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); } -- cgit v1.2.3