Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
This commit is contained in:
commit
5a8e79528f
18 files changed
+595
-44
No files matched your search
@@ -161,7 +161,7 @@ void AuthSession::AsyncReadHeader()
|
||||
}
|
||||
else
|
||||
{
|
||||
_socket.close();
|
||||
CloseSocket();
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -176,7 +176,7 @@ void AuthSession::AsyncReadData(bool (AuthSession::*handler)(), size_t dataSize,
|
||||
{
|
||||
if (!(*this.*handler)())
|
||||
{
|
||||
_socket.close();
|
||||
CloseSocket();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -184,7 +184,7 @@ void AuthSession::AsyncReadData(bool (AuthSession::*handler)(), size_t dataSize,
|
||||
}
|
||||
else
|
||||
{
|
||||
_socket.close();
|
||||
CloseSocket();
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -195,7 +195,7 @@ void AuthSession::AsyncWrite(std::size_t length)
|
||||
{
|
||||
if (error)
|
||||
{
|
||||
_socket.close();
|
||||
CloseSocket();
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -889,3 +889,11 @@ void AuthSession::SetVSFields(const std::string& rI)
|
||||
stmt->setString(2, _login);
|
||||
LoginDatabase.Execute(stmt);
|
||||
}
|
||||
|
||||
void AuthSession::CloseSocket()
|
||||
{
|
||||
boost::system::error_code socketError;
|
||||
_socket.close(socketError);
|
||||
if (socketError)
|
||||
TC_LOG_DEBUG("server.authserver", "Account '%s' errored when closing socket: %i (%s)", _login.c_str(), socketError.value(), socketError.message());
|
||||
}
|
||||
Reference in new issue
Block a user