From afa99c41fc9a140d758bff396c73410ab76ac2d9 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Mon, 21 Nov 2016 11:50:32 +0100 Subject: [PATCH] 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) --- src/net_processing.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 6e027a7000..38ed805a58 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -2923,7 +2923,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic& interruptMsg // 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();