diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-21 11:50:32 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-21 11:51:03 +0100 |
| commit | c3906403c8edb17433a6370bfb65324f9c7f361c (patch) | |
| tree | 3ee6aec6698529241f1677287a9074b3a5105e28 | |
| parent | 7490ae8b699d2955b665cf849d86ff5bb5245c28 (diff) | |
| parent | 46625538d674a5aaf1bcfa7c8be8a49e5a23fa9e (diff) | |
| download | bitcoin-c3906403c8edb17433a6370bfb65324f9c7f361c.tar.xz | |
Merge #9117: net: don't send feefilter messages before the version handshake is complete
4662553 net: don't send feefilter messages before the version handshake is complete (Cory Fields)
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index aeeb31ec40..52f53ce87a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6967,7 +6967,7 @@ bool SendMessages(CNode* pto, CConnman& connman) // Message: feefilter // // We don't want white listed peers to filter txs to us if we have -whitelistforcerelay - if (pto->nVersion >= FEEFILTER_VERSION && GetBoolArg("-feefilter", DEFAULT_FEEFILTER) && + if (!pto->fDisconnect && pto->nVersion >= FEEFILTER_VERSION && GetBoolArg("-feefilter", DEFAULT_FEEFILTER) && !(pto->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY))) { CAmount currentFilter = mempool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK(); int64_t timeNow = GetTimeMicros(); |