Improve log messages for blocks only violations.

This commit is contained in:
Patick Strateman 2015-11-20 15:54:27 -08:00
parent 08843ed998
commit 80ae230a52

View File

@ -4256,7 +4256,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
else else
{ {
if (fBlocksOnly) if (fBlocksOnly)
LogPrint("net", "peer sent inv %s in violation of protocol peer=%d\n", inv.ToString(), pfrom->id); LogPrint("net", "transaction (%s) inv sent in violation of protocol peer=%d\n", inv.hash.ToString(), pfrom->id);
else if (!fAlreadyHave && !fImporting && !fReindex) else if (!fAlreadyHave && !fImporting && !fReindex)
pfrom->AskFor(inv); pfrom->AskFor(inv);
} }
@ -4388,7 +4388,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
// We are in blocks only mode and peer is either not whitelisted or whitelistalwaysrelay is off // We are in blocks only mode and peer is either not whitelisted or whitelistalwaysrelay is off
if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY) && (!pfrom->fWhitelisted || !GetBoolArg("-whitelistalwaysrelay", DEFAULT_WHITELISTALWAYSRELAY))) if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY) && (!pfrom->fWhitelisted || !GetBoolArg("-whitelistalwaysrelay", DEFAULT_WHITELISTALWAYSRELAY)))
{ {
LogPrint("net", "peer sent transaction in violation of protocol peer=%d\n", pfrom->id); LogPrint("net", "transaction sent in violation of protocol peer=%d\n", pfrom->id);
return true; return true;
} }