Merge bitcoin/bitcoin#27743: p2p: Unconditionally return when compact block status == READ_STATUS_FAILED

fanquake · fanquake · commit e43432086a77 · 2023-05-25T10:05:55.000+01:00
d972695 Unconditionally return when compact block status == READ_STATUS_FAILED (Greg Sanders) Pull request description: Fixes bitcoin/bitcoin#27626 (comment) which would have resulted in wasted bandwidth every once in a while. ACKs for top commit: Sjors: utACK d972695 mzumsande: ACK d972695 Tree-SHA512: 2483cae03093fc61b36279bbc455829822258703ae608ff2797a20449410b12bfe8d40de63c02fc79ed4ef4d91b34c63281b71b81a1c691cab9647b65761586f
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -4365,11 +4365,11 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
                         std::vector<CInv> vInv(1);
                         vInv[0] = CInv(MSG_BLOCK | GetFetchFlags(*peer), blockhash);
                         m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::GETDATA, vInv));
-                        return;
                     } else {
                         // Give up for this peer and wait for other peer(s)
                         RemoveBlockRequest(pindex->GetBlockHash(), pfrom.GetId());
                     }
+                    return;
                 }
 
                 BlockTransactionsRequest req;

Original file line number	Diff line number	Diff line change
`@@ -4365,11 +4365,11 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,`
`4365`	`4365`	`std::vector<CInv> vInv(1);`
`4366`	`4366`	`vInv[0] = CInv(MSG_BLOCK \| GetFetchFlags(*peer), blockhash);`
`4367`	`4367`	`m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::GETDATA, vInv));`
`4368`		`- return;`
`4369`	`4368`	`} else {`
`4370`	`4369`	`// Give up for this peer and wait for other peer(s)`
`4371`	`4370`	`RemoveBlockRequest(pindex->GetBlockHash(), pfrom.GetId());`
`4372`	`4371`	`}`
	`4372`	`+ return;`
`4373`	`4373`	`}`
`4374`	`4374`
`4375`	`4375`	`BlockTransactionsRequest req;`