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

Adding error handling and additional checks.

Browse Source
This commit is contained in:
lotodore
2009-07-22 20:22:14 +00:00
parent e308108803
commit 1783218e6a
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/serverlobbythread.cpp
+14 -3
View File
@@ -228,13 +228,17 @@ ServerLobbyThread::RemoveSessionFromGame(SessionWrapper session)
void void
ServerLobbyThread::CloseSession(SessionWrapper session) ServerLobbyThread::CloseSession(SessionWrapper session)
{ {
if (session.sessionData && session.sessionData->GetState() != SessionData::Closed) // Make this call reentrant.
{
LOG_VERBOSE("Closing session #" << session.sessionData->GetId() << "."); LOG_VERBOSE("Closing session #" << session.sessionData->GetId() << ".");
session.sessionData->SetState(SessionData::Closed);
m_sessionManager.RemoveSession(session.sessionData->GetId()); m_sessionManager.RemoveSession(session.sessionData->GetId());
m_gameSessionManager.RemoveSession(session.sessionData->GetId()); m_gameSessionManager.RemoveSession(session.sessionData->GetId());
// Update stats (if needed). // Update stats (if needed).
UpdateStatisticsNumberOfPlayers(); UpdateStatisticsNumberOfPlayers();
}
} }
void void
@@ -534,6 +538,8 @@ ServerLobbyThread::HandleRead(const boost::system::error_code &ec, SessionId ses
if (!ec) if (!ec)
{ {
ReceiveBuffer &buf = session.sessionData->GetReceiveBuffer(); ReceiveBuffer &buf = session.sessionData->GetReceiveBuffer();
if (buf.recvBufUsed + bytesRead > RECV_BUF_SIZE)
LOG_ERROR("Internal error: Receive buffer overflow!");
buf.recvBufUsed += bytesRead; buf.recvBufUsed += bytesRead;
GetReceiver().ScanPackets(buf); GetReceiver().ScanPackets(buf);
bool errorFlag = false; bool errorFlag = false;
@@ -561,6 +567,11 @@ ServerLobbyThread::HandleRead(const boost::system::error_code &ec, SessionId ses
else else
HandlePacket(session, packet); 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) if (!errorFlag)
{ {
session.sessionData->GetAsioSocket()->async_read_some( session.sessionData->GetAsioSocket()->async_read_some(
@@ -573,7 +584,7 @@ ServerLobbyThread::HandleRead(const boost::system::error_code &ec, SessionId ses
boost::asio::placeholders::bytes_transferred)); boost::asio::placeholders::bytes_transferred));
} }
} }
else else if (ec != boost::asio::error::operation_aborted)
{ {
// On error: Close this session. // On error: Close this session.
boost::shared_ptr<ServerGame> game = InternalGetGameFromId(session.sessionData->GetGameId()); boost::shared_ptr<ServerGame> game = InternalGetGameFromId(session.sessionData->GetGameId());
@@ -583,9 +594,9 @@ ServerLobbyThread::HandleRead(const boost::system::error_code &ec, SessionId ses
CloseSession(session); CloseSession(session);
} }
} }
} catch (...) } catch (const exception &e)
{ {
LOG_ERROR("Session " << sessionId << " - unknown exception in HandleRead."); LOG_ERROR("Session " << sessionId << " - unhandled exception in HandleRead: " << e.what());
} }
} }
src/net/sessiondata.h
+1 -1
View File
@@ -39,7 +39,7 @@ typedef unsigned SessionId;
class SessionData class SessionData
{ {
public: public:
enum State { Init, ReceivingAvatar, Established, Game }; enum State { Init, ReceivingAvatar, Established, Game, Closed };
SessionData(boost::shared_ptr<boost::asio::ip::tcp::socket> sock, SessionId id, SessionDataCallback &cb); SessionData(boost::shared_ptr<boost::asio::ip::tcp::socket> sock, SessionId id, SessionDataCallback &cb);
~SessionData(); ~SessionData();