aboutsummaryrefslogtreecommitdiff
path: root/src/net.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-05-31 15:47:15 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-05-31 15:47:32 +0200
commit862fd24b40b478f815dcb5df4f705cae2c0a1cf9 (patch)
treee76f4407498a0df5a8b017b9a3102f92de074c0a /src/net.h
parenta2df115249386d277a90d7aeac20b629369e4d32 (diff)
parent7e908c7b826cedbf29560ce7a668af809ee71524 (diff)
downloadbitcoin-862fd24b40b478f815dcb5df4f705cae2c0a1cf9.tar.xz
Merge #8080: Do not use mempool for GETDATA for tx accepted after the last mempool req.
7e908c7 Do not use mempool for GETDATA for tx accepted after the last mempool req. (Gregory Maxwell)
Diffstat (limited to 'src/net.h')
-rw-r--r--src/net.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/net.h b/src/net.h
index 59176deeeb..0b4cd0bcb3 100644
--- a/src/net.h
+++ b/src/net.h
@@ -17,6 +17,7 @@
#include "sync.h"
#include "uint256.h"
+#include <atomic>
#include <deque>
#include <stdint.h>
@@ -414,6 +415,8 @@ public:
// Used for BIP35 mempool sending, also protected by cs_inventory
bool fSendMempool;
+ // Last time a "MEMPOOL" request was serviced.
+ std::atomic<int64_t> timeLastMempoolReq;
// Ping time measurement:
// The pong reply we're expecting, or 0 if no pong expected.
uint64_t nPingNonceSent;