Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 13:22:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Part 3: Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

Browse Source
This commit is contained in:
Shauren
2014-07-19 17:03:32 +02:00
parent 2452cfb98e
commit 0bcc92d900
16 changed files with 299 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/authserver/Main.cpp
View File

@@ -33,6 +33,8 @@
#include "AsyncAcceptor.h"
#include "AuthSession.h"
#include "BattlenetManager.h"
#include "BattlenetSession.h"
#include "Common.h"
#include "Configuration/Config.h"
#include "Database/DatabaseEnv.h"
@@ -117,7 +119,7 @@ int main(int argc, char** argv)
std::string bindIp = sConfigMgr->GetStringDefault("BindIP", "0.0.0.0");
AsyncAcceptor<AuthSession> authServer(_ioService, bindIp, port);
AsyncAcceptor<Battlenet::Socket> bnetServer(_ioService, bindIp, 1119);
AsyncAcceptor<Battlenet::Session> bnetServer(_ioService, bindIp, 1119);
// Set signal handlers
boost::asio::signal_set signals(_ioService, SIGINT, SIGTERM);