changeset 3140:83b1a9fd7456 draft

Merge pull request #1546 from gmaxwell/allowsamenetinbound Do not consider inbound peers for outbound network group exclusion.
author Jeff Garzik <jgarzik@exmulti.com>
date Tue, 03 Jul 2012 19:51:08 -0700
parents e66ce99c71ff (current diff) 5e02eb37b998 (diff)
children 48fbe53e9baf c5058f8dc07c
files src/net.cpp
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1430,16 +1430,17 @@
         //
         CAddress addrConnect;
 
-        // Only connect to one address per a.b.?.? range.
+        // Only connect out to one peer per network group (/16 for IPv4).
         // Do this here so we don't have to critsect vNodes inside mapAddresses critsect.
         int nOutbound = 0;
         set<vector<unsigned char> > setConnected;
         {
             LOCK(cs_vNodes);
             BOOST_FOREACH(CNode* pnode, vNodes) {
-                setConnected.insert(pnode->addr.GetGroup());
-                if (!pnode->fInbound)
+                if (!pnode->fInbound) {
+                    setConnected.insert(pnode->addr.GetGroup());
                     nOutbound++;
+                }
             }
         }