diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2016-11-09 12:45:13 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-12-02 07:41:11 +0000 |
| commit | 6fe3981ac8267f9f045b0d518399d943d3147268 (patch) | |
| tree | 0751d0d0247c7186d3df1d7c6d954610a9ce3f23 /src | |
| parent | 5f3a12c97c25f811083679cd3f284059cf7ea54f (diff) | |
| download | bitcoin-6fe3981ac8267f9f045b0d518399d943d3147268.tar.xz | |
net: don't send feefilter messages before the version handshake is complete
Github-Pull: #9117
Rebased-From: 46625538d674a5aaf1bcfa7c8be8a49e5a23fa9e
Diffstat (limited to 'src')
| -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 cf96efbe81..083ea194ab 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6856,7 +6856,7 @@ bool SendMessages(CNode* pto) // 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(); |