sfence
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix exception caused by destroying sockets on Server shutdown

master
kwolekr 2013-12-24 23:50:49 -05:00
parent 767b2e7b17
commit 25b1cca415
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/socket.cpp
View File

@ -546,7 +546,10 @@ bool UDPSocket::WaitData(int timeout_ms)
if(result == 0) if(result == 0)
return false; 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; return false;
else if(result < 0) else if(result < 0)
{ {
@ -557,9 +560,9 @@ bool UDPSocket::WaitData(int timeout_ms)
int e = WSAGetLastError(); int e = WSAGetLastError();
dstream << (int) m_handle << ": WSAGetLastError()=" dstream << (int) m_handle << ": WSAGetLastError()="
<< e << std::endl; << 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; return false;
} }
#endif #endif