diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2016-03-28 02:02:29 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2016-03-28 02:36:58 +0100 |
| commit | 423bded9a61e3f1c51ba00327898126c4e3a3f53 (patch) | |
| tree | 6ba07fa8ba0dc2f63e06a5ebeb07b12a67d0f37d /src/server/bnetserver/Server | |
| parent | 06b3bca0d2bf6f049128da110681a5244d90225a (diff) | |
Core/Network: Change SocketMgr.StartNetwork to take the thread count by arg instead of config
AuthSocketMgr doesn't need "Network.Threads" config
Fixes "Missing name Network.Threads in config file authserver.conf"
Ref #16859
(cherry picked from commit 980f28d2ce099f524abdb6faed3fe59ce4c0963a)
# Conflicts:
# src/server/authserver/Server/AuthSocketMgr.h
# src/server/game/Server/WorldSocketMgr.cpp
Diffstat (limited to 'src/server/bnetserver/Server')
| -rw-r--r-- | src/server/bnetserver/Server/SessionManager.cpp | 4 | ||||
| -rw-r--r-- | src/server/bnetserver/Server/SessionManager.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/bnetserver/Server/SessionManager.cpp b/src/server/bnetserver/Server/SessionManager.cpp index c53214495d4..91618ba31dc 100644 --- a/src/server/bnetserver/Server/SessionManager.cpp +++ b/src/server/bnetserver/Server/SessionManager.cpp @@ -17,9 +17,9 @@ #include "SessionManager.h" -bool Battlenet::SessionManager::StartNetwork(boost::asio::io_service& service, std::string const& bindIp, uint16 port) +bool Battlenet::SessionManager::StartNetwork(boost::asio::io_service& service, std::string const& bindIp, uint16 port, int threadCount) { - if (!BaseSocketMgr::StartNetwork(service, bindIp, port)) + if (!BaseSocketMgr::StartNetwork(service, bindIp, port, 1)) return false; _acceptor->SetSocketFactory(std::bind(&BaseSocketMgr::GetSocketForAccept, this)); diff --git a/src/server/bnetserver/Server/SessionManager.h b/src/server/bnetserver/Server/SessionManager.h index 5cf0b199f15..701802056da 100644 --- a/src/server/bnetserver/Server/SessionManager.h +++ b/src/server/bnetserver/Server/SessionManager.h @@ -53,7 +53,7 @@ namespace Battlenet return instance; } - bool StartNetwork(boost::asio::io_service& service, std::string const& bindIp, uint16 port) override; + bool StartNetwork(boost::asio::io_service& service, std::string const& bindIp, uint16 port, int threadCount = 1) override; // noop for now, will be needed later to broadcast realmlist updates for example void AddSession(Session* /*session*/); |
