Merge pull request #3047 from Diapolo/misbehave

gavinandresen · gavinandresen · commit 15b48ab03612 · 2013-10-04T04:08:43.000-07:00
special case DoS value == 0
diff --git a/src/main.cpp b/src/main.cpp
@@ -3785,8 +3785,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
             if (nEvicted > 0)
                 LogPrint("mempool", "mapOrphan overflow, removed %u tx\n", nEvicted);
         }
-        int nDoS;
-        if (state.IsInvalid(nDoS))
+        int nDoS = 0;
+        if (state.IsInvalid(nDoS) && nDoS > 0)
             pfrom->Misbehaving(nDoS);
     }
 
@@ -3805,8 +3805,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
         CValidationState state;
         if (ProcessBlock(state, pfrom, &block))
             mapAlreadyAskedFor.erase(inv);
-        int nDoS;
-        if (state.IsInvalid(nDoS))
+        int nDoS = 0;
+        if (state.IsInvalid(nDoS) && nDoS > 0)
             pfrom->Misbehaving(nDoS);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3785,8 +3785,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)`
`3785`	`3785`	`if (nEvicted > 0)`
`3786`	`3786`	`LogPrint("mempool", "mapOrphan overflow, removed %u tx\n", nEvicted);`
`3787`	`3787`	`}`
`3788`		`- int nDoS;`
`3789`		`- if (state.IsInvalid(nDoS))`
	`3788`	`+ int nDoS = 0;`
	`3789`	`+ if (state.IsInvalid(nDoS) && nDoS > 0)`
`3790`	`3790`	`pfrom->Misbehaving(nDoS);`
`3791`	`3791`	`}`
`3792`	`3792`
`@@ -3805,8 +3805,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)`
`3805`	`3805`	`CValidationState state;`
`3806`	`3806`	`if (ProcessBlock(state, pfrom, &block))`
`3807`	`3807`	`mapAlreadyAskedFor.erase(inv);`
`3808`		`- int nDoS;`
`3809`		`- if (state.IsInvalid(nDoS))`
	`3808`	`+ int nDoS = 0;`
	`3809`	`+ if (state.IsInvalid(nDoS) && nDoS > 0)`
`3810`	`3810`	`pfrom->Misbehaving(nDoS);`
`3811`	`3811`	`}`
`3812`	`3812`