sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed player disconnects (again).

Browse Source
This commit is contained in:
lotodore
2007-06-15 20:56:31 +00:00
parent 0f04c39a5b
commit 4e6a78dcb5
5 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/senderthread.cpp
+22 -6
View File
@@ -92,9 +92,17 @@ SenderThread::Main()
int selectResult = select(m_curSocket + 1, NULL, &writeSet, NULL, &timeout);
if (!IS_VALID_SELECT(selectResult))
{
m_callback.SignalNetError(m_curSocket, ERR_SOCK_SELECT_FAILED, SOCKET_ERRNO());
// Assume that this is a fatal error, terminate thread.
return;
// Never assume that this is a fatal error.
int errCode = SOCKET_ERRNO();
if (errCode != SOCKET_ERR_WOULDBLOCK)
{
// Skip this packet - this is bad, and is therefore reported.
// Ignore invalid or not connected sockets.
if (errCode != SOCKET_ERR_NOTCONN && errCode != SOCKET_ERR_NOTSOCK)
m_callback.SignalNetError(m_curSocket, ERR_SOCK_SELECT_FAILED, errCode);
m_tmpOutBufSize = 0;
}
Msleep(SEND_TIMEOUT_MSEC);
}
if (selectResult > 0) // send is possible
{
@@ -103,9 +111,17 @@ SenderThread::Main()
if (!IS_VALID_SEND(bytesSent))
{
m_callback.SignalNetError(m_curSocket, ERR_SOCK_SEND_FAILED, SOCKET_ERRNO());
// Assume that this is a fatal error, terminate thread.
return;
// Never assume that this is a fatal error.
int errCode = SOCKET_ERRNO();
if (errCode != SOCKET_ERR_WOULDBLOCK)
{
// Skip this packet - this is bad, and is therefore reported.
// Ignore invalid or not connected sockets.
if (errCode != SOCKET_ERR_NOTCONN && errCode != SOCKET_ERR_NOTSOCK)
m_callback.SignalNetError(m_curSocket, ERR_SOCK_SEND_FAILED, errCode);
m_tmpOutBufSize = 0;
}
Msleep(SEND_TIMEOUT_MSEC);
}
else if ((unsigned)bytesSent < m_tmpOutBufSize)
{