diff options
| -rw-r--r-- | src/main.h | 2 | ||||
| -rw-r--r-- | src/net.cpp | 8 | ||||
| -rw-r--r-- | src/net.h | 3 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/main.h b/src/main.h index f62cfbef6d..f20fad98a4 100644 --- a/src/main.h +++ b/src/main.h @@ -35,8 +35,6 @@ static const unsigned int MAX_STANDARD_TX_SIZE = MAX_BLOCK_SIZE_GEN/5; static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; /** The maximum number of orphan transactions kept in memory */ static const unsigned int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/100; -/** The maximum number of entries in an 'inv' protocol message */ -static const unsigned int MAX_INV_SZ = 50000; /** The maximum size of a blk?????.dat file (since 0.8) */ static const unsigned int MAX_BLOCKFILE_SIZE = 0x8000000; // 128 MiB /** The pre-allocation chunk size for blk?????.dat files (since 0.8) */ diff --git a/src/net.cpp b/src/net.cpp index dc9a7e5371..adc5f93029 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -5,7 +5,7 @@ #include "db.h" #include "net.h" -#include "main.h" +#include "core.h" #include "addrman.h" #include "ui_interface.h" #include "script.h" @@ -1567,11 +1567,6 @@ void static StartSync(const vector<CNode*> &vNodes) { CNode *pnodeNewSync = NULL; double dBestScore = 0; - // fImporting and fReindex are accessed out of cs_main here, but only - // as an optimization - they are checked again in SendMessages. - if (fImporting || fReindex) - return; - // Iterate over all nodes BOOST_FOREACH(CNode* pnode, vNodes) { // check preconditions for allowing a sync @@ -1855,7 +1850,6 @@ bool StopNode() { printf("StopNode()\n"); MapPort(false); - nTransactionsUpdated++; if (semOutbound) for (int i=0; i<MAX_OUTBOUND_CONNECTIONS; i++) semOutbound->post(); @@ -23,6 +23,9 @@ #include "hash.h" #include "bloom.h" +/** The maximum number of entries in an 'inv' protocol message */ +static const unsigned int MAX_INV_SZ = 50000; + class CNode; class CBlockIndex; extern int nBestHeight; |