From 3ad05386c844438af0dda56bbb46fa665d870c5c Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 28 Jul 2020 19:44:38 +0200 Subject: Core/Networking: Fixed authserver socket read handlers being called on incorrect thread --- src/server/game/Server/WorldSocketMgr.cpp | 2 -- src/server/shared/Networking/SocketMgr.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index 845ea4a52a8..3b801375903 100644 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -74,8 +74,6 @@ bool WorldSocketMgr::StartWorldNetwork(Trinity::Asio::IoContext& ioContext, std: if (!BaseSocketMgr::StartNetwork(ioContext, bindIp, port, threadCount)) return false; - _acceptor->SetSocketFactory(std::bind(&BaseSocketMgr::GetSocketForAccept, this)); - _acceptor->AsyncAcceptWithCallback<&OnSocketAccept>(); sScriptMgr->OnNetworkStart(); diff --git a/src/server/shared/Networking/SocketMgr.h b/src/server/shared/Networking/SocketMgr.h index 64f064aadf2..0aa443f4cc8 100644 --- a/src/server/shared/Networking/SocketMgr.h +++ b/src/server/shared/Networking/SocketMgr.h @@ -66,6 +66,8 @@ public: for (int32 i = 0; i < _threadCount; ++i) _threads[i].Start(); + _acceptor->SetSocketFactory([this]() { return GetSocketForAccept(); }); + return true; } -- cgit v1.2.3