Merge pull request #4869

6050ab6 netbase: Make SOCKS5 negotiation interruptible (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan
2014-09-15 17:25:12 +02:00
2 changed files with 70 additions and 22 deletions

View File

@@ -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();