diff options
| author | Subv <subv2112@gmail.com> | 2014-07-06 17:03:54 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2014-07-06 17:04:42 -0500 |
| commit | 77caf33debab6153da46da11ff8aff5142b42b2a (patch) | |
| tree | d8f21b5a64089c03b4f9cdc373b5f7c14286674c /src/server/authserver/Server/AuthSession.cpp | |
| parent | 59c8ffe4b3fec5979926d991c17cae84b41e46e2 (diff) | |
Removed some unneeded boost dependencies.
Ensure that the correct packet sizes are read in the authserver.
Added some try catch to the authserver to deal with boost exceptions (this part is not finished)
Diffstat (limited to 'src/server/authserver/Server/AuthSession.cpp')
| -rw-r--r-- | src/server/authserver/Server/AuthSession.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/authserver/Server/AuthSession.cpp b/src/server/authserver/Server/AuthSession.cpp index f518dc7593b..df90339222d 100644 --- a/src/server/authserver/Server/AuthSession.cpp +++ b/src/server/authserver/Server/AuthSession.cpp @@ -19,6 +19,7 @@ #include <memory> #include <boost/lexical_cast.hpp> #include <boost/asio/write.hpp> +#include <boost/asio/read.hpp> #include <AuthSession.h> #include <Log.h> #include "ByteBuffer.h" @@ -136,7 +137,7 @@ void AuthSession::AsyncReadHeader() { auto self(shared_from_this()); - _socket.async_read_some(boost::asio::buffer(_readBuffer, 1), [this, self](boost::system::error_code error, size_t transferedBytes) + boost::asio::async_read(_socket, boost::asio::buffer(_readBuffer, 1), [this, self](boost::system::error_code error, size_t transferedBytes) { if (!error && transferedBytes == 1) { @@ -147,7 +148,7 @@ void AuthSession::AsyncReadHeader() // Handle dynamic size packet if (_readBuffer[0] == AUTH_LOGON_CHALLENGE) { - _socket.read_some(boost::asio::buffer(&_readBuffer[1], sizeof(uint8) + sizeof(uint16))); //error + size + boost::asio::read(_socket, boost::asio::buffer(&_readBuffer[1], sizeof(uint8) + sizeof(uint16))); //error + size AsyncReadData(entry.handler, *reinterpret_cast<uint16*>(&_readBuffer[2]), sizeof(uint8) + sizeof(uint8) + sizeof(uint16)); // cmd + error + size } @@ -170,7 +171,7 @@ void AuthSession::AsyncReadData(bool (AuthSession::*handler)(), size_t dataSize, { auto self(shared_from_this()); - _socket.async_read_some(boost::asio::buffer(&_readBuffer[bufferOffSet], dataSize), [handler, this, self](boost::system::error_code error, size_t transferedBytes) + boost::asio::async_read(_socket, boost::asio::buffer(&_readBuffer[bufferOffSet], dataSize), [handler, this, self](boost::system::error_code error, size_t transferedBytes) { if (!error && transferedBytes > 0) { |