diff options
| author | Gregory Maxwell <[email protected]> | 2014-04-09 09:25:52 -0700 |
|---|---|---|
| committer | langerhans <[email protected]> | 2014-05-26 20:53:05 +0200 |
| commit | b9ad84bb6cce75bf5d7bf8bef47eb7dc7bc5b6cd (patch) | |
| tree | 97b188f912c8061c6c6279474aff81f678d4a8a9 /src | |
| parent | Changed bitrpc.py's raw_input to getpass for password input (diff) | |
| download | discoin-b9ad84bb6cce75bf5d7bf8bef47eb7dc7bc5b6cd.tar.xz discoin-b9ad84bb6cce75bf5d7bf8bef47eb7dc7bc5b6cd.zip | |
Prevent socket leak in ThreadSocketHandler.
When we are over our outbound limit ThreadSocketHandler would try to
keep the connection if the peer was addnoded.
This didn't actually work for two reasons: It didn't actually run
the accept code due to mistaken code flow, and because we have a
limited number of outbound semaphores it couldn't actually use the
connection.
Instead it leaked the socket, which might have caused issue #4034.
This patch just takes out the non-functioning white-listing for now.
Diffstat (limited to 'src')
| -rw-r--r-- | src/net.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/net.cpp b/src/net.cpp index e62de1044..f53fb2271 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -944,11 +944,7 @@ void ThreadSocketHandler() } else if (nInbound >= nMaxConnections - MAX_OUTBOUND_CONNECTIONS) { - { - LOCK(cs_setservAddNodeAddresses); - if (!setservAddNodeAddresses.count(addr)) - closesocket(hSocket); - } + closesocket(hSocket); } else if (CNode::IsBanned(addr)) { |