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)
8 years ago · c3906403c8
parent 7490ae8b69 46625538d6
commit c3906403c8
1 changed files with 1 additions and 1 deletions
--- 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();