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

Close the socket before client termination, don't let asio close it later because the callbacks might no longer be valid.

Browse Source
This commit is contained in:
lotodore
2009-06-15 06:42:52 +00:00
parent 30a7f8c8bc
commit 1acbeba426
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientthread.cpp
+6
View File
@@ -422,6 +422,11 @@ ClientThread::Main()
boost::asio::io_service::work ioWork(*m_ioService); boost::asio::io_service::work ioWork(*m_ioService);
m_ioService->run(); // Will only be aborted asynchronously. m_ioService->run(); // Will only be aborted asynchronously.
} }
// Close the socket.
GetContext().GetSessionData()->GetAsioSocket()->close();
// Execute remaining ready handlers.
m_ioService->reset();
m_ioService->poll();
} catch (const PokerTHException &e) } catch (const PokerTHException &e)
{ {
GetCallback().SignalNetClientError(e.GetErrorId(), e.GetOsErrorCode()); GetCallback().SignalNetClientError(e.GetErrorId(), e.GetOsErrorCode());
@@ -443,6 +448,7 @@ ClientThread::RegisterTimers()
boost::bind( boost::bind(
&ClientThread::TimerCheckAvatarDownloads, shared_from_this(), boost::asio::placeholders::error)); &ClientThread::TimerCheckAvatarDownloads, shared_from_this(), boost::asio::placeholders::error));
// TODO: send directly without additional buffer.
m_sendTimer.expires_from_now( m_sendTimer.expires_from_now(
boost::posix_time::milliseconds(CLIENT_SEND_LOOP_MSEC)); boost::posix_time::milliseconds(CLIENT_SEND_LOOP_MSEC));
m_sendTimer.async_wait( m_sendTimer.async_wait(