Add whitelistalwaysrelay option

This commit is contained in:
Patick Strateman
2015-11-14 04:46:23 -08:00
parent 420fa8143a
commit 3a964973fe
3 changed files with 13 additions and 1 deletions

View File

@@ -816,6 +816,16 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
}
#endif
}
// disable walletbroadcast in blocksonly mode
if (GetBoolArg("-blocksonly", false)) {
if (SoftSetBoolArg("-whitelistalwaysrelay", false))
LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -whitelistalwaysrelay=0\n", __func__);
#ifdef ENABLE_WALLET
if (SoftSetBoolArg("-walletbroadcast", false))
LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__);
#endif
}
// Make sure enough file descriptors are available
int nBind = std::max((int)mapArgs.count("-bind") + (int)mapArgs.count("-whitebind"), 1);