2 files changed, 25 insertions, 5 deletions

diff --git a/src/net.cpp b/src/net.cpp
index 6e74cbb..4603d2d 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1627,11 +1627,23 @@ void ThreadSocketHandler2(void* parg)
                 // node or a deliberate connection-exhaustion flood -- must not
                 // be able to take the whole table, which is what starved the
                 // relays.
+                //
+                // Loopback is exempt. Onion peers reach a managed-Tor node
+                // through its local hidden-service listener, so every one of
+                // them accepts as 127.0.0.1; capping loopback would cap all
+                // inbound onion peers as a single group, which is the opposite
+                // of where the network is headed. The global MAX_CONNECTIONS
+                // still bounds the total, and the direct-IP flood this defends
+                // against never arrives over loopback. (Per-onion-identity
+                // limiting, once a peer's identity is known past accept(), is
+                // the right tool for onion and is left for later.)
+                bool fLoopback = (addr.GetByte(3) == 127);
                 unsigned int nFromThisIP = 0;
-                CRITICAL_BLOCK(cs_vNodes)
-                    for (vector<CNode*>::iterator it = vNodes.begin(); it != vNodes.end(); ++it)
-                        if ((*it)->addr.ip == addr.ip)
-                            nFromThisIP++;
+                if (!fLoopback)
+                    CRITICAL_BLOCK(cs_vNodes)
+                        for (vector<CNode*>::iterator it = vNodes.begin(); it != vNodes.end(); ++it)
+                            if ((*it)->addr.ip == addr.ip)
+                                nFromThisIP++;
 
                 if (nNodes >= MAX_CONNECTIONS)
                 {
@@ -1639,7 +1651,7 @@ void ThreadSocketHandler2(void* parg)
                              addr.ToString().c_str(), nNodes);
                     BtfCloseSocket(hSocket);
                 }
-                else if (nFromThisIP >= MAX_CONNECTIONS_PER_IP)
+                else if (!fLoopback && nFromThisIP >= MAX_CONNECTIONS_PER_IP)
                 {
                     LogPrint("net", "refusing connection from %s, already %u from that address\n",
                              addr.ToString().c_str(), nFromThisIP);
diff --git a/src/net.h b/src/net.h
index 4fdd1b3..e3d4a93 100644
--- a/src/net.h
+++ b/src/net.h
@@ -119,6 +119,14 @@ static const unsigned int MAX_CONNECTIONS = 125;
 // needs only a handful; 32 leaves generous room while denying any one address
 // more than a quarter of the table. The firewall connlimit on the relays does
 // the same thing a layer lower; this makes every build carry the defense.
+//
+// Loopback (127.0.0.0/8) is exempt in the accept path. A managed-Tor node
+// receives every inbound onion peer over its local hidden-service listener, so
+// they all appear as 127.0.0.1 -- capping loopback would cap onion peers as a
+// group, which is exactly wrong for a network moving toward onion-only. The
+// global MAX_CONNECTIONS still bounds the total; a per-onion-identity limit,
+// applied once identity is known after accept(), is the right future tool for
+// onion floods.
 static const unsigned int MAX_CONNECTIONS_PER_IP = 32;
 
 // A node marked for disconnect is normally held until its buffers drain, so