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

TheBlueMatt · furszy · commit 335502668276 · 2021-12-10T21:20:45.000-03: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
@@ -1065,10 +1065,10 @@ void static ProcessGetData(CNode* pfrom, CConnman* connman, const std::atomic<bo
         }
     } // 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) {
+            it++;
             ProcessGetBlockData(pfrom, inv, connman, interruptMsgProc);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1065,10 +1065,10 @@ void static ProcessGetData(CNode* pfrom, CConnman* connman, const std::atomic<bo`
`1065`	`1065`	`}`
`1066`	`1066`	`} // release cs_main`
`1067`	`1067`
`1068`		`- if (it != pfrom->vRecvGetData.end()) {`
	`1068`	`+ if (it != pfrom->vRecvGetData.end() && !pfrom->fPauseSend) {`
`1069`	`1069`	`const CInv &inv = *it;`
`1070`		`- it++;`
`1071`	`1070`	`if (inv.type == MSG_BLOCK \|\| inv.type == MSG_FILTERED_BLOCK) {`
	`1071`	`+ it++;`
`1072`	`1072`	`ProcessGetBlockData(pfrom, inv, connman, interruptMsgProc);`
`1073`	`1073`	`}`
`1074`	`1074`	`}`