From e8b2be3527c7683e8bfca70ed7706fc20da566fd Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 8 Apr 2025 19:15:16 +0200 Subject: Core/Network: Socket refactors * Devirtualize calls to Read and Update by marking concrete implementations as final * Removed derived class template argument * Specialize boost::asio::basic_stream_socket for boost::asio::io_context instead of type-erased any_io_executor * Make socket initialization easier composable (before entering Read loop) * Remove use of deprecated boost::asio::null_buffers and boost::beast::ssl_stream --- src/server/bnetserver/Server/SessionManager.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/server/bnetserver/Server/SessionManager.h') diff --git a/src/server/bnetserver/Server/SessionManager.h b/src/server/bnetserver/Server/SessionManager.h index c635122c977..528ece8739e 100644 --- a/src/server/bnetserver/Server/SessionManager.h +++ b/src/server/bnetserver/Server/SessionManager.h @@ -15,15 +15,15 @@ * with this program. If not, see . */ -#ifndef SessionManager_h__ -#define SessionManager_h__ +#ifndef TRINITYCORE_SESSION_MANAGER_H +#define TRINITYCORE_SESSION_MANAGER_H #include "SocketMgr.h" #include "Session.h" namespace Battlenet { - class SessionManager : public SocketMgr + class SessionManager : public Trinity::Net::SocketMgr { typedef SocketMgr BaseSocketMgr; @@ -33,13 +33,10 @@ namespace Battlenet bool StartNetwork(Trinity::Asio::IoContext& ioContext, std::string const& bindIp, uint16 port, int threadCount = 1) override; protected: - NetworkThread* CreateThreads() const override; - - private: - static void OnSocketAccept(boost::asio::ip::tcp::socket&& sock, uint32 threadIndex); + Trinity::Net::NetworkThread* CreateThreads() const override; }; } #define sSessionMgr Battlenet::SessionManager::Instance() -#endif // SessionManager_h__ +#endif // TRINITYCORE_SESSION_MANAGER_H -- cgit v1.2.3