diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-15 17:25:12 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-15 17:25:12 +0200 |
| commit | 327dcfece7e13ceaeafbf29785e3076dbf6f1d28 (patch) | |
| tree | b76e22a36cf678660beb6e5ca61ba0b9cf9710b7 /src/net.cpp | |
| parent | ec91092df8f70c4abef6bbb3c4dec6d9511405fe (diff) | |
| parent | 6050ab685553c7312ef105d2c4a5230c3fcf4002 (diff) | |
| download | bitcoin-327dcfece7e13ceaeafbf29785e3076dbf6f1d28.tar.xz | |
Merge pull request #4869
6050ab6 netbase: Make SOCKS5 negotiation interruptible (Wladimir J. van der Laan)
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/net.cpp b/src/net.cpp index a4bafe5914..e742da84fb 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -488,10 +488,6 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest) { addrman.Attempt(addrConnect); - // Set to non-blocking - if (!SetSocketNonBlocking(hSocket, true)) - LogPrintf("ConnectNode: Setting socket to non-blocking failed, error %s\n", NetworkErrorString(WSAGetLastError())); - // Add node CNode* pnode = new CNode(hSocket, addrConnect, pszDest ? pszDest : "", false); pnode->AddRef(); |