Browse Source

Merge pull request #3047 from Diapolo/misbehave

special case DoS value == 0
0.10
Gavin Andresen 11 years ago
parent
commit
15b48ab036
  1. 8
      src/main.cpp

8
src/main.cpp

@ -3785,8 +3785,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
if (nEvicted > 0) if (nEvicted > 0)
LogPrint("mempool", "mapOrphan overflow, removed %u tx\n", nEvicted); LogPrint("mempool", "mapOrphan overflow, removed %u tx\n", nEvicted);
} }
int nDoS; int nDoS = 0;
if (state.IsInvalid(nDoS)) if (state.IsInvalid(nDoS) && nDoS > 0)
pfrom->Misbehaving(nDoS); pfrom->Misbehaving(nDoS);
} }
@ -3805,8 +3805,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
CValidationState state; CValidationState state;
if (ProcessBlock(state, pfrom, &block)) if (ProcessBlock(state, pfrom, &block))
mapAlreadyAskedFor.erase(inv); mapAlreadyAskedFor.erase(inv);
int nDoS; int nDoS = 0;
if (state.IsInvalid(nDoS)) if (state.IsInvalid(nDoS) && nDoS > 0)
pfrom->Misbehaving(nDoS); pfrom->Misbehaving(nDoS);
} }

Loading…
Cancel
Save