Fix ignoring tx data requests when fPauseSend is set on a peer

TheBlueMatt · TheBlueMatt · commit c4af73876347 · 2018-02-08T18:06:21.000-05:00
This resolves a bug introduced in 66aa1d5 where, if when responding to a series of transaction requests in a getdata we hit the send buffer limit and set fPauseSend, we will skip one transaction per call to ProcessGetData. Bug found by Cory Fields (@theuni).
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -1226,10 +1226,10 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
         }
     } // release cs_main
 
-    if (it != pfrom->vRecvGetData.end()) {
+    if (it != pfrom->vRecvGetData.end() && !pfrom->fPauseSend) {
         const CInv &inv = *it;
-        it++;
         if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK || inv.type == MSG_WITNESS_BLOCK) {
+            it++;
             ProcessGetBlockData(pfrom, consensusParams, inv, connman, interruptMsgProc);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1226,10 +1226,10 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam`
`1226`	`1226`	`}`
`1227`	`1227`	`} // release cs_main`
`1228`	`1228`
`1229`		`- if (it != pfrom->vRecvGetData.end()) {`
	`1229`	`+ if (it != pfrom->vRecvGetData.end() && !pfrom->fPauseSend) {`
`1230`	`1230`	`const CInv &inv = *it;`
`1231`		`- it++;`
`1232`	`1231`	`if (inv.type == MSG_BLOCK \|\| inv.type == MSG_FILTERED_BLOCK \|\| inv.type == MSG_CMPCT_BLOCK \|\| inv.type == MSG_WITNESS_BLOCK) {`
	`1232`	`+ it++;`
`1233`	`1233`	`ProcessGetBlockData(pfrom, consensusParams, inv, connman, interruptMsgProc);`
`1234`	`1234`	`}`
`1235`	`1235`	`}`