From 85a7d5ce9ac68b30da2277cc91d4b70358f1880d Mon Sep 17 00:00:00 2001 From: ariel- Date: Mon, 19 Jun 2017 23:20:06 -0300 Subject: Core: ported headers cleanup from master branch --- src/server/worldserver/RemoteAccess/RASession.cpp | 18 +++++++++--------- src/server/worldserver/RemoteAccess/RASession.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/server/worldserver/RemoteAccess') diff --git a/src/server/worldserver/RemoteAccess/RASession.cpp b/src/server/worldserver/RemoteAccess/RASession.cpp index 3df9556c73d..136814743a0 100644 --- a/src/server/worldserver/RemoteAccess/RASession.cpp +++ b/src/server/worldserver/RemoteAccess/RASession.cpp @@ -16,17 +16,17 @@ * with this program. If not, see . */ -#include -#include -#include -#include #include "RASession.h" #include "AccountMgr.h" -#include "Log.h" +#include "Config.h" #include "DatabaseEnv.h" +#include "Log.h" +#include "Util.h" #include "World.h" -#include "Config.h" #include "ServerMotd.h" +#include +#include +#include using boost::asio::ip::tcp; @@ -40,7 +40,7 @@ void RASession::Start() if (_socket.available() > 0) { // Handle subnegotiation - boost::array buf; + char buf[1024] = { }; _socket.read_some(boost::asio::buffer(buf)); // Send the end-of-negotiation packet @@ -89,7 +89,7 @@ void RASession::Start() _socket.close(); } -int RASession::Send(const char* data) +int RASession::Send(char const* data) { std::ostream os(&_writeBuffer); os << data; @@ -205,7 +205,7 @@ bool RASession::ProcessCommand(std::string& command) return false; } -void RASession::CommandPrint(void* callbackArg, const char* text) +void RASession::CommandPrint(void* callbackArg, char const* text) { if (!text || !*text) return; diff --git a/src/server/worldserver/RemoteAccess/RASession.h b/src/server/worldserver/RemoteAccess/RASession.h index be40c80c5d4..a2e39888212 100644 --- a/src/server/worldserver/RemoteAccess/RASession.h +++ b/src/server/worldserver/RemoteAccess/RASession.h @@ -43,13 +43,13 @@ public: unsigned short GetRemotePort() const { return _socket.remote_endpoint().port(); } private: - int Send(const char* data); + int Send(char const* data); std::string ReadString(); bool CheckAccessLevel(const std::string& user); bool CheckPassword(const std::string& user, const std::string& pass); bool ProcessCommand(std::string& command); - static void CommandPrint(void* callbackArg, const char* text); + static void CommandPrint(void* callbackArg, char const* text); static void CommandFinished(void* callbackArg, bool); tcp::socket _socket; -- cgit v1.2.3