diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2016-11-09 12:45:13 -0500 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2016-11-09 12:45:13 -0500 |
| commit | 46625538d674a5aaf1bcfa7c8be8a49e5a23fa9e (patch) | |
| tree | 9444ceabcc5ba67de19a6b530f1590c0f785806c | |
| parent | 9f554e03ebe5701c1b75ff03b3d6152095c0cad3 (diff) | |
| download | bitcoin-46625538d674a5aaf1bcfa7c8be8a49e5a23fa9e.tar.xz | |
net: don't send feefilter messages before the version handshake is complete
| -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 2fb143e6a0..01e2f15812 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6939,7 +6939,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(); |