highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-21 07:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix comparison tool by asking for blocks more aggressively

Browse Source 
Rebased-from: b33b9a6fef
This commit is contained in:
Matt Corallo
2013-10-25 03:52:53 -04:00
committed by Wladimir J. van der Laan
parent 7084756f4f
commit 5c55bf5af0
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

@@ -2123,7 +2123,7 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk
uniqueTx.insert(GetTxHash(i)); uniqueTx.insert(GetTxHash(i));
} }
if (uniqueTx.size() != vtx.size()) if (uniqueTx.size() != vtx.size())
return state.DoS(100, error("CheckBlock() : duplicate transaction")); return state.DoS(100, error("CheckBlock() : duplicate transaction"), true);
unsigned int nSigOps = 0; unsigned int nSigOps = 0;
BOOST_FOREACH(const CTransaction& tx, vtx) BOOST_FOREACH(const CTransaction& tx, vtx)
@@ -3583,7 +3583,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
pfrom->AddInventoryKnown(inv); pfrom->AddInventoryKnown(inv);
CValidationState state; CValidationState state;
if (ProcessBlock(state, pfrom, &block)) if (ProcessBlock(state, pfrom, &block) || state.CorruptionPossible())
mapAlreadyAskedFor.erase(inv); mapAlreadyAskedFor.erase(inv);
int nDoS; int nDoS;
if (state.IsInvalid(nDoS)) if (state.IsInvalid(nDoS))

7
src/main.h
View File

@@ -1881,13 +1881,15 @@ private:
MODE_ERROR, // run-time error MODE_ERROR, // run-time error
} mode; } mode;
int nDoS; int nDoS;
bool corruptionPossible;
public: public:
CValidationState() : mode(MODE_VALID), nDoS(0) {} CValidationState() : mode(MODE_VALID), nDoS(0) {}
bool DoS(int level, bool ret = false) { bool DoS(int level, bool ret = false, bool corruptionIn = false) {
if (mode == MODE_ERROR) if (mode == MODE_ERROR)
return ret; return ret;
nDoS += level; nDoS += level;
mode = MODE_INVALID; mode = MODE_INVALID;
corruptionPossible = corruptionIn;
return ret; return ret;
} }
bool Invalid(bool ret = false) { bool Invalid(bool ret = false) {
@@ -1917,6 +1919,9 @@ public:
} }
return false; return false;
} }
bool CorruptionPossible() {
return corruptionPossible;
}
}; };