aboutsummaryrefslogtreecommitdiff
path: root/src/net.cpp
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.cpp
parenta2df115249386d277a90d7aeac20b629369e4d32 (diff)
parent7e908c7b826cedbf29560ce7a668af809ee71524 (diff)
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.cpp')
-rw-r--r--src/net.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/net.cpp b/src/net.cpp
index a0c670e595..78a914ebdf 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2397,6 +2397,7 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
fRelayTxes = false;
fSentAddr = false;
pfilter = new CBloomFilter();
+ timeLastMempoolReq = 0;
nPingNonceSent = 0;
nPingUsecStart = 0;
nPingUsecTime = 0;