Merge pull request #1546 from gmaxwell/allowsamenetinbound

Do not consider inbound peers for outbound network group exclusion.

src/net.cpp

@@ -1430,18 +1430,19 @@ void ThreadOpenConnections2(void* parg)
         //
         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) {
+                if (!pnode->fInbound) {
                     setConnected.insert(pnode->addr.GetGroup());
-                if (!pnode->fInbound)
                     nOutbound++;
                 }
             }
+        }
 
         int64 nANow = GetAdjustedTime();