Core/Authserver: Added missing auth socket manager

Closes #13085
This commit is contained in:
Shauren
2014-09-10 21:17:55 +02:00
parent afbb3f6ae5
commit 946e2d0ca6
3 changed files with 73 additions and 13 deletions

View File

@@ -44,6 +44,7 @@ endif()
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src/server/shared
${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
${CMAKE_SOURCE_DIR}/src/server/shared/Database
${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
${CMAKE_SOURCE_DIR}/src/server/shared/Packets

View File

@@ -24,23 +24,21 @@
* authentication server
*/
#include <cstdlib>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/program_options.hpp>
#include <iostream>
#include <openssl/opensslv.h>
#include <openssl/crypto.h>
#include "AsyncAcceptor.h"
#include "AuthSession.h"
#include "AuthSocketMgr.h"
#include "Common.h"
#include "Configuration/Config.h"
#include "Database/DatabaseEnv.h"
#include "Config.h"
#include "DatabaseEnv.h"
#include "Log.h"
#include "ProcessPriority.h"
#include "RealmList.h"
#include "SystemConfig.h"
#include "Util.h"
#include <cstdlib>
#include <iostream>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/program_options.hpp>
#include <openssl/opensslv.h>
#include <openssl/crypto.h>
using boost::asio::ip::tcp;
using namespace boost::program_options;
@@ -118,8 +116,8 @@ int main(int argc, char** argv)
}
std::string bindIp = sConfigMgr->GetStringDefault("BindIP", "0.0.0.0");
AsyncAcceptor authServer(_ioService, bindIp, port);
authServer.AsyncAccept<AuthSession>();
sAuthSocketMgr.StartNetwork(_ioService, bindIp, port);
// Set signal handlers
boost::asio::signal_set signals(_ioService, SIGINT, SIGTERM);

View File

@@ -0,0 +1,61 @@
/*
* Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef AuthSocketMgr_h__
#define AuthSocketMgr_h__
#include "SocketMgr.h"
#include "AuthSession.h"
void OnSocketAccept(tcp::socket&& sock);
class AuthSocketMgr : public SocketMgr<AuthSession>
{
typedef SocketMgr<AuthSession> BaseSocketMgr;
public:
static AuthSocketMgr& Instance()
{
static AuthSocketMgr instance;
return instance;
}
bool StartNetwork(boost::asio::io_service& service, std::string const& bindIp, uint16 port) override
{
if (!BaseSocketMgr::StartNetwork(service, bindIp, port))
return false;
_acceptor->AsyncAcceptManaged(&OnSocketAccept);
return true;
}
protected:
NetworkThread<AuthSession>* CreateThreads() const override
{
return new NetworkThread<AuthSession>[1];
}
};
#define sAuthSocketMgr AuthSocketMgr::Instance()
void OnSocketAccept(tcp::socket&& sock)
{
sAuthSocketMgr.OnSocketOpen(std::forward<tcp::socket>(sock));
}
#endif // AuthSocketMgr_h__