From 366ca98b39cc6744202e71b402008f07c1847a08 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 16 Jun 2021 11:26:53 +0800
Subject: [PATCH] Merge bitcoin/bitcoin#22144: Randomize message processing
 peer order

79c02c88b347f1408a2db307db2654917f9b0bcc Randomize message processing peer order (Pieter Wuille)

Pull request description:

  Right now, the message handling loop iterates the list of nodes always in the same order: the order they were connected in (see the `vNodes` vector). For some parts of the net processing logic, this order matters. Transaction requests are assigned explicitly to peers since #19988, but many other parts of processing work on a "first-served-by-loop-first" basis, such as block downloading. If peers can predict this ordering, it may be exploited to cause delays.

  As there isn't anything particularly optimal about the current ordering, just make it unpredictable by randomizing.

  Reported by Crypt-iQ.

ACKs for top commit:
  jnewbery:
    ACK 79c02c88b3
  Crypt-iQ:
    ACK 79c02c88b347f1408a2db307db2654917f9b0bcc
  sdaftuar:
    utACK 79c02c88b347f1408a2db307db2654917f9b0bcc
  achow101:
    Code Review ACK 79c02c88b347f1408a2db307db2654917f9b0bcc
  jamesob:
    crACK https://github.com/bitcoin/bitcoin/pull/22144/commits/79c02c88b347f1408a2db307db2654917f9b0bcc
  jonatack:
    ACK 79c02c88b347f1408a2db307db2654917f9b0bcc
  vasild:
    ACK 79c02c88b347f1408a2db307db2654917f9b0bcc
  theStack:
    ACK 79c02c88b347f1408a2db307db2654917f9b0bcc

Tree-SHA512: 9a87c4dcad47c2d61b76c4f37f59674876b78f33f45943089bf159902a23e12de7a5feae1a73b17cbc3f2e37c980ecf0f7fd86af9e6fa3a68099537a3c82c106
---
 src/net.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/net.cpp b/src/net.cpp
index e2739b6106428..a43bf285fa033 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2965,6 +2965,7 @@ void CConnman::ThreadMessageHandler()
 {
     int64_t nLastSendMessagesTimeMasternodes = 0;
 
+    FastRandomContext rng;
     while (!flagInterruptMsgProc)
     {
         std::vector<CNode*> vNodesCopy = CopyNodeVector();
@@ -2976,6 +2977,10 @@ void CConnman::ThreadMessageHandler()
             fSkipSendMessagesForMasternodes = false;
             nLastSendMessagesTimeMasternodes = GetTimeMillis();
         }
+        // Randomize the order in which we process messages from/to our peers.
+        // This prevents attacks in which an attacker exploits having multiple
+        // consecutive connections in the vNodes list.
+        Shuffle(vNodesCopy.begin(), vNodesCopy.end(), rng);
 
         for (CNode* pnode : vNodesCopy)
         {