Permalink
Browse files

net: don't send feefilter messages before the version handshake is co…

…mplete

Github-Pull: #9117
Rebased-From: 4662553
  • Loading branch information...
1 parent 5f3a12c commit 6fe3981ac8267f9f045b0d518399d943d3147268 @theuni theuni committed with luke-jr Nov 9, 2016
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/main.cpp
View
@@ -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();

0 comments on commit 6fe3981

Please sign in to comment.