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

Handle interrupted/retry error code in read handler.

Browse Source
This commit is contained in:
lotodore
2009-07-30 21:47:30 +00:00
parent e6c1043993
commit b81d357f1a
1 changed files with 57 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/serverlobbythread.cpp
+57 -50
View File
@@ -527,9 +527,9 @@ ServerLobbyThread::CancelTimers()
void void
ServerLobbyThread::HandleRead(const boost::system::error_code &ec, SessionId sessionId, size_t bytesRead) ServerLobbyThread::HandleRead(const boost::system::error_code &ec, SessionId sessionId, size_t bytesRead)
{ {
try if (ec != boost::asio::error::operation_aborted)
{ {
if (!ec) try
{ {
// Find the session. // Find the session.
SessionWrapper session = m_sessionManager.GetSessionById(sessionId); SessionWrapper session = m_sessionManager.GetSessionById(sessionId);
@@ -538,41 +538,55 @@ ServerLobbyThread::HandleRead(const boost::system::error_code &ec, SessionId ses
if (session.sessionData) if (session.sessionData)
{ {
ReceiveBuffer &buf = session.sessionData->GetReceiveBuffer(); ReceiveBuffer &buf = session.sessionData->GetReceiveBuffer();
if (buf.recvBufUsed + bytesRead > RECV_BUF_SIZE) if (!ec)
LOG_ERROR("Session " << session.sessionData->GetId() << " - Internal error: Receive buffer overflow!"); {
buf.recvBufUsed += bytesRead; if (buf.recvBufUsed + bytesRead > RECV_BUF_SIZE)
GetReceiver().ScanPackets(buf); LOG_ERROR("Session " << session.sessionData->GetId() << " - Internal error: Receive buffer overflow!");
bool errorFlag = false; buf.recvBufUsed += bytesRead;
GetReceiver().ScanPackets(buf);
bool errorFlag = false;
while (!buf.receivedPackets.empty()) while (!buf.receivedPackets.empty())
{
boost::shared_ptr<NetPacket> packet = buf.receivedPackets.front();
buf.receivedPackets.pop_front();
// Retrieve current game, if applicable.
boost::shared_ptr<ServerGame> game = InternalGetGameFromId(session.sessionData->GetGameId());
if (game)
{ {
// We need to catch game-specific exceptions, so that they do not affect the server. boost::shared_ptr<NetPacket> packet = buf.receivedPackets.front();
try buf.receivedPackets.pop_front();
// Retrieve current game, if applicable.
boost::shared_ptr<ServerGame> game = InternalGetGameFromId(session.sessionData->GetGameId());
if (game)
{ {
game->HandlePacket(session, packet); // We need to catch game-specific exceptions, so that they do not affect the server.
} catch (const PokerTHException &e) try
{ {
LOG_ERROR("Game " << game->GetId() << " - Read handler exception: " << e.what()); game->HandlePacket(session, packet);
game->RemoveAllSessions(); } catch (const PokerTHException &e)
errorFlag = true; {
break; LOG_ERROR("Game " << game->GetId() << " - Read handler exception: " << e.what());
game->RemoveAllSessions();
errorFlag = true;
break;
}
} }
else
HandlePacket(session, packet);
}
if (buf.recvBufUsed >= RECV_BUF_SIZE)
{
LOG_ERROR("Session " << session.sessionData->GetId() << " - Full receive buf but no valid packet.");
buf.recvBufUsed = 0;
}
if (!errorFlag)
{
session.sessionData->GetAsioSocket()->async_read_some(
boost::asio::buffer(buf.recvBuf + buf.recvBufUsed, RECV_BUF_SIZE - buf.recvBufUsed),
boost::bind(
&ServerLobbyThread::HandleRead,
this,
boost::asio::placeholders::error,
sessionId,
boost::asio::placeholders::bytes_transferred));
} }
else
HandlePacket(session, packet);
} }
if (buf.recvBufUsed >= RECV_BUF_SIZE) else if (ec == boost::asio::error::interrupted || ec == boost::asio::error::try_again)
{
LOG_ERROR("Session " << session.sessionData->GetId() << " - Full receive buf but no valid packet.");
buf.recvBufUsed = 0;
}
if (!errorFlag)
{ {
session.sessionData->GetAsioSocket()->async_read_some( session.sessionData->GetAsioSocket()->async_read_some(
boost::asio::buffer(buf.recvBuf + buf.recvBufUsed, RECV_BUF_SIZE - buf.recvBufUsed), boost::asio::buffer(buf.recvBuf + buf.recvBufUsed, RECV_BUF_SIZE - buf.recvBufUsed),
@@ -583,28 +597,21 @@ ServerLobbyThread::HandleRead(const boost::system::error_code &ec, SessionId ses
sessionId, sessionId,
boost::asio::placeholders::bytes_transferred)); boost::asio::placeholders::bytes_transferred));
} }
else if (ec != boost::asio::error::operation_aborted)
{
LOG_ERROR("Connection closed: " << ec);
// On error: Close this session.
boost::shared_ptr<ServerGame> game = InternalGetGameFromId(session.sessionData->GetGameId());
if (game)
game->ErrorRemoveSession(session);
else
CloseSession(session);
}
} }
} } catch (const exception &e)
else if (ec != boost::asio::error::operation_aborted)
{ {
LOG_ERROR("Connection closed: " << ec); LOG_ERROR("Session " << sessionId << " - unhandled exception in HandleRead: " << e.what());
// On error: Close this session.
// Find the session.
SessionWrapper session = m_sessionManager.GetSessionById(sessionId);
if (!session.sessionData)
session = m_gameSessionManager.GetSessionById(sessionId);
if (session.sessionData)
{
boost::shared_ptr<ServerGame> game = InternalGetGameFromId(session.sessionData->GetGameId());
if (game)
game->ErrorRemoveSession(session);
else
CloseSession(session);
}
} }
} catch (const exception &e)
{
LOG_ERROR("Session " << sessionId << " - unhandled exception in HandleRead: " << e.what());
} }
} }