diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-07-20 16:54:18 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-07-20 16:54:28 +0200 |
| commit | 1a2de3237fc06a97dd83ab12759c57d83db370ef (patch) | |
| tree | 41e95768db9f2aa7314fa3f898239c5c1d3e5e74 /src/netbase.cpp | |
| parent | Merge pull request #6447 (diff) | |
| parent | Test whether created sockets are select()able (diff) | |
| download | discoin-1a2de3237fc06a97dd83ab12759c57d83db370ef.tar.xz discoin-1a2de3237fc06a97dd83ab12759c57d83db370ef.zip | |
Merge pull request #6412
d422f9b Test whether created sockets are select()able (Pieter Wuille)
Diffstat (limited to 'src/netbase.cpp')
| -rw-r--r-- | src/netbase.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp index c9fc7d67f..b7e2e5791 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -266,6 +266,9 @@ bool static InterruptibleRecv(char* data, size_t len, int timeout, SOCKET& hSock } else { // Other error or blocking int nErr = WSAGetLastError(); if (nErr == WSAEINPROGRESS || nErr == WSAEWOULDBLOCK || nErr == WSAEINVAL) { + if (!IsSelectableSocket(hSocket)) { + return false; + } struct timeval tval = MillisToTimeval(std::min(endTime - curTime, maxWait)); fd_set fdset; FD_ZERO(&fdset); |