Merge branch '0.4.x' into 0.5.x

1 files changed, 4 insertions, 2 deletions

diff --git a/src/net.cpp b/src/net.cpp
index 0c98b8ee3e..e0041ed24b 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1542,12 +1542,14 @@ void ThreadOpenConnections2(void* parg)
         CAddress addrConnect;
         int64 nBest = std::numeric_limits<int64>::min();
 
-        // 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.
         set<unsigned int> setConnected;
         CRITICAL_BLOCK(cs_vNodes)
             BOOST_FOREACH(CNode* pnode, vNodes)
-                setConnected.insert(pnode->addr.ip & 0x0000ffff);
+                if (!pnode->fInbound) {
+                    setConnected.insert(pnode->addr.ip & 0x0000ffff);
+                }
 
         int64 nANow = GetAdjustedTime();