Core/Network: Fix invalid NetworkThread array access for derived classes that have additional data members (only HttpService threads were affected)

5 files changed, 30 insertions, 24 deletions

diff --git a/src/server/bnetserver/REST/LoginRESTService.h b/src/server/bnetserver/REST/LoginRESTService.h
index e9bc68ffdf9..aefa6fc2296 100644
--- a/src/server/bnetserver/REST/LoginRESTService.h
+++ b/src/server/bnetserver/REST/LoginRESTService.h
@@ -42,7 +42,7 @@ enum class BanMode
     BAN_ACCOUNT = 1
 };
 
-class LoginRESTService : public Trinity::Net::Http::HttpService<LoginHttpSession>
+class LoginRESTService final : public Trinity::Net::Http::HttpService<LoginHttpSession>
 {
 public:
     using RequestHandlerResult = Trinity::Net::Http::RequestHandlerResult;
diff --git a/src/server/bnetserver/Server/SessionManager.cpp b/src/server/bnetserver/Server/SessionManager.cpp
index 4c5b532ee60..b1dac140084 100644
--- a/src/server/bnetserver/Server/SessionManager.cpp
+++ b/src/server/bnetserver/Server/SessionManager.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "SessionManager.h"
-#include "Util.h"
 
 bool Battlenet::SessionManager::StartNetwork(Trinity::Asio::IoContext& ioContext, std::string const& bindIp, uint16 port, int threadCount)
 {
@@ -30,9 +29,9 @@ bool Battlenet::SessionManager::StartNetwork(Trinity::Asio::IoContext& ioContext
     return true;
 }
 
-Trinity::Net::NetworkThread<Battlenet::Session>* Battlenet::SessionManager::CreateThreads() const
+Battlenet::SessionNetworkThread* Battlenet::SessionManager::CreateThreads() const
 {
-    return new Trinity::Net::NetworkThread<Session>[GetNetworkThreadCount()];
+    return new SessionNetworkThread[GetNetworkThreadCount()];
 }
 
 Battlenet::SessionManager& Battlenet::SessionManager::Instance()
diff --git a/src/server/bnetserver/Server/SessionManager.h b/src/server/bnetserver/Server/SessionManager.h
index 528ece8739e..aa2ecdbf9de 100644
--- a/src/server/bnetserver/Server/SessionManager.h
+++ b/src/server/bnetserver/Server/SessionManager.h
@@ -23,9 +23,13 @@
 
 namespace Battlenet
 {
-    class SessionManager : public Trinity::Net::SocketMgr<Session>
+    class SessionNetworkThread final : public Trinity::Net::NetworkThread<Session>
     {
-        typedef SocketMgr<Session> BaseSocketMgr;
+    };
+
+    class SessionManager final : public Trinity::Net::SocketMgr<Session, SessionNetworkThread>
+    {
+        using BaseSocketMgr = SocketMgr;
 
     public:
         static SessionManager& Instance();
@@ -33,7 +37,7 @@ namespace Battlenet
         bool StartNetwork(Trinity::Asio::IoContext& ioContext, std::string const& bindIp, uint16 port, int threadCount = 1) override;
 
     protected:
-        Trinity::Net::NetworkThread<Session>* CreateThreads() const override;
+        SessionNetworkThread* CreateThreads() const override;
     };
 }
 
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index 4205b6912f0..ee2f2f478a2 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -17,24 +17,19 @@
 
 #include "WorldSocketMgr.h"
 #include "Config.h"
-#include "NetworkThread.h"
 #include "ScriptMgr.h"
 #include <boost/system/error_code.hpp>
 
-class WorldSocketThread : public Trinity::Net::NetworkThread<WorldSocket>
+void WorldSocketThread::SocketAdded(std::shared_ptr<WorldSocket> const& sock)
 {
-public:
-    void SocketAdded(std::shared_ptr<WorldSocket> const& sock) override
-    {
-        sock->SetSendBufferSize(sWorldSocketMgr.GetApplicationSendBufferSize());
-        sScriptMgr->OnSocketOpen(sock);
-    }
+    sock->SetSendBufferSize(sWorldSocketMgr.GetApplicationSendBufferSize());
+    sScriptMgr->OnSocketOpen(sock);
+}
 
-    void SocketRemoved(std::shared_ptr<WorldSocket>const& sock) override
-    {
-        sScriptMgr->OnSocketClose(sock);
-    }
-};
+void WorldSocketThread::SocketRemoved(std::shared_ptr<WorldSocket>const& sock)
+{
+    sScriptMgr->OnSocketClose(sock);
+}
 
 WorldSocketMgr::WorldSocketMgr() : BaseSocketMgr(), _socketSystemSendBufferSize(-1), _socketApplicationSendBufferSize(65536), _tcpNoDelay(true)
 {
@@ -114,7 +109,7 @@ void WorldSocketMgr::OnSocketOpen(Trinity::Net::IoContextTcpSocket&& sock, uint3
     BaseSocketMgr::OnSocketOpen(std::move(sock), threadIndex);
 }
 
-Trinity::Net::NetworkThread<WorldSocket>* WorldSocketMgr::CreateThreads() const
+WorldSocketThread* WorldSocketMgr::CreateThreads() const
 {
     return new WorldSocketThread[GetNetworkThreadCount()];
 }
diff --git a/src/server/game/Server/WorldSocketMgr.h b/src/server/game/Server/WorldSocketMgr.h
index 9f905f23cd2..f9aa81df768 100644
--- a/src/server/game/Server/WorldSocketMgr.h
+++ b/src/server/game/Server/WorldSocketMgr.h
@@ -21,10 +21,18 @@
 #include "SocketMgr.h"
 #include "WorldSocket.h"
 
+class WorldSocketThread final : public Trinity::Net::NetworkThread<WorldSocket>
+{
+public:
+    void SocketAdded(std::shared_ptr<WorldSocket> const& sock) override;
+
+    void SocketRemoved(std::shared_ptr<WorldSocket>const& sock) override;
+};
+
 /// Manages all sockets connected to peers and network threads
-class TC_GAME_API WorldSocketMgr : public Trinity::Net::SocketMgr<WorldSocket>
+class TC_GAME_API WorldSocketMgr final : public Trinity::Net::SocketMgr<WorldSocket, WorldSocketThread>
 {
-    typedef SocketMgr<WorldSocket> BaseSocketMgr;
+    using BaseSocketMgr = SocketMgr;
 
 public:
     ~WorldSocketMgr();
@@ -44,7 +52,7 @@ public:
 protected:
     WorldSocketMgr();
 
-    Trinity::Net::NetworkThread<WorldSocket>* CreateThreads() const override;
+    WorldSocketThread* CreateThreads() const override;
 
 private:
     int32 _socketSystemSendBufferSize;