aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorPatick Strateman <patrick.strateman@gmail.com>2015-11-14 04:46:23 -0800
committerPatick Strateman <patrick.strateman@gmail.com>2015-11-14 04:52:21 -0800
commit3a964973fe9335f31c418b00e762ea04c3d3f088 (patch)
tree41c38ed9f028280f3802c4ac863f2278eb34b2ff /src/main.cpp
parent420fa8143a81f60fea79ee05df553e89378f1054 (diff)
downloadbitcoin-3a964973fe9335f31c418b00e762ea04c3d3f088.tar.xz
Add whitelistalwaysrelay option
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index b35a032733..9842acb4b3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4465,7 +4465,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
assert(recentRejects);
recentRejects->insert(tx.GetHash());
- if (pfrom->fWhitelisted) {
+ if (pfrom->fWhitelisted && GetBoolArg("-whitelistalwaysrelay", DEFAULT_WHITELISTALWAYSRELAY)) {
// Always relay transactions received from whitelisted peers, even
// if they were rejected from the mempool, allowing the node to
// function as a gateway for nodes hidden behind it.