Skip to content
Permalink
Browse files

Fix exception caused by destroying sockets on Server shutdown

  • Loading branch information
kwolekr committed Dec 31, 2013
1 parent 767b2e7 commit 25b1cca4150a9f78b05b98afee71a97fd052df71
Showing with 6 additions and 3 deletions.
  1. +6 −3 src/socket.cpp
@@ -546,7 +546,10 @@ bool UDPSocket::WaitData(int timeout_ms)

if(result == 0)
return false;
else if(result < 0 && errno == EINTR)
else if(result < 0 && (errno == EINTR || errno == EBADF))
// N.B. select() fails when sockets are destroyed on Connection's dtor
// with EBADF. Instead of doing tricky synchronization, allow this
// thread to exit but don't throw an exception.
return false;
else if(result < 0)
{
@@ -557,9 +560,9 @@ bool UDPSocket::WaitData(int timeout_ms)
int e = WSAGetLastError();
dstream << (int) m_handle << ": WSAGetLastError()="
<< e << std::endl;
if(e == 10004 /* = WSAEINTR */)
if(e == 10004 /* = WSAEINTR */ || e == 10009 /*WSAEBADF*/)
{
dstream << "WARNING: Ignoring WSAEINTR." << std::endl;
dstream << "WARNING: Ignoring WSAEINTR/WSAEBADF." << std::endl;
return false;
}
#endif

0 comments on commit 25b1cca

Please sign in to comment.