Core: Implemented IPC (Inter-process communication) between worldserver and bnetserver using ZeroMQ library.

* Implemented ToonReady and ToonLoggedOut battle.net packets

15 files changed, 327 insertions, 30 deletions

diff --git a/src/server/bnetserver/CMakeLists.txt b/src/server/bnetserver/CMakeLists.txt
index 9d99ac7f0c5..5b854018d47 100644
--- a/src/server/bnetserver/CMakeLists.txt
+++ b/src/server/bnetserver/CMakeLists.txt
@@ -45,6 +45,7 @@ endif()
 
 include_directories(
   ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/dep/zmqpp
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
@@ -56,6 +57,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/shared/Networking
   ${CMAKE_SOURCE_DIR}/src/server/shared/Threading
   ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities
+  ${CMAKE_SOURCE_DIR}/src/server/ipc
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/Authentication
   ${CMAKE_CURRENT_SOURCE_DIR}/Realms
@@ -64,6 +66,7 @@ include_directories(
   ${MYSQL_INCLUDE_DIR}
   ${OPENSSL_INCLUDE_DIR}
   ${VALGRIND_INCLUDE_DIR}
+  ${ZMQ_INCLUDE_DIR}
 )
 
 add_executable(bnetserver
@@ -80,9 +83,12 @@ if( NOT WIN32 )
 endif()
 
 target_link_libraries(bnetserver
+  ipc
   shared
+  zmqpp
   ${MYSQL_LIBRARY}
   ${OPENSSL_LIBRARIES}
+  ${ZMQ_LIBRARY}
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
 )
diff --git a/src/server/bnetserver/Main.cpp b/src/server/bnetserver/Main.cpp
index ff891304bd3..ce90019c011 100644
--- a/src/server/bnetserver/Main.cpp
+++ b/src/server/bnetserver/Main.cpp
@@ -35,6 +35,7 @@
 #include "RealmList.h"
 #include "SystemConfig.h"
 #include "Util.h"
+#include "ZmqContext.h"
 #include <cstdlib>
 #include <iostream>
 #include <boost/date_time/posix_time/posix_time.hpp>
@@ -94,12 +95,21 @@ int main(int argc, char** argv)
         }
     }
 
+    int32 worldListenPort = sConfigMgr->GetIntDefault("WorldserverListenPort", 1118);
+    if (worldListenPort < 0 || worldListenPort > 0xFFFF)
+    {
+        TC_LOG_ERROR("server.bnetserver", "Specified worldserver listen port (%d) out of allowed range (1-65535)", worldListenPort);
+        return 1;
+    }
+
     // Initialize the database connection
     if (!StartDB())
         return 1;
 
+    sIpcContext->Initialize();
+
     // Get the list of realms for the server
-    sRealmList->Initialize(_ioService, sConfigMgr->GetIntDefault("RealmsStateUpdateDelay", 10));
+    sRealmList->Initialize(_ioService, sConfigMgr->GetIntDefault("RealmsStateUpdateDelay", 10), worldListenPort);
 
     // Start the listening port (acceptor) for auth connections
     int32 bnport = sConfigMgr->GetIntDefault("BattlenetPort", 1119);
@@ -135,6 +145,10 @@ int main(int argc, char** argv)
     // Start the io service worker loop
     _ioService.run();
 
+    sIpcContext->Close();
+
+    sRealmList->Close();
+
     // Close the Database Pool and library
     StopDB();
 
diff --git a/src/server/bnetserver/Packets/BitStream.h b/src/server/bnetserver/Packets/BitStream.h
index 952ec5a39e2..54c61ab3bbf 100644
--- a/src/server/bnetserver/Packets/BitStream.h
+++ b/src/server/bnetserver/Packets/BitStream.h
@@ -212,14 +212,6 @@ namespace Battlenet
             }
         }
 
-        void SetReadPos(uint32 bits)
-        {
-            if (bits > _writePos)
-                throw BitStreamPositionException(true, bits, 0, _writePos);
-
-            _readPos = bits;
-        }
-
         bool IsRead() const { return _readPos >= _writePos; }
 
         uint8* GetBuffer() { return _buffer.data(); }
@@ -227,6 +219,10 @@ namespace Battlenet
 
         size_t GetSize() const { return ((_writePos + 7) & ~7) / 8; }
 
+        // These methods are meant to only be used when their corresponding actions in the client ignore the value completely
+        void ReadSkip(uint32 bitCount) { _readPos += bitCount; }
+        void WriteSkip(uint32 bitCount) { Write(0, bitCount); }
+
     private:
         uint32 _writePos;
         uint32 _readPos;
diff --git a/src/server/bnetserver/Packets/FriendsPackets.cpp b/src/server/bnetserver/Packets/FriendsPackets.cpp
index 14c5fb3a665..2659ec6204f 100644
--- a/src/server/bnetserver/Packets/FriendsPackets.cpp
+++ b/src/server/bnetserver/Packets/FriendsPackets.cpp
@@ -132,7 +132,7 @@ std::string Battlenet::Friends::SocialNetworkCheckConnectedResult::ToString() co
 
 void Battlenet::Friends::SocialNetworkCheckConnectedResult::Write()
 {
-    _stream.Write(0, 23); // Ignored
+    _stream.WriteSkip(23);
     _stream.Write(Result, 16);
     _stream.Write(SocialNetworkId, 32);
 }
diff --git a/src/server/bnetserver/Packets/PacketManager.cpp b/src/server/bnetserver/Packets/PacketManager.cpp
index 019cf48ac30..e18f3dc5ffb 100644
--- a/src/server/bnetserver/Packets/PacketManager.cpp
+++ b/src/server/bnetserver/Packets/PacketManager.cpp
@@ -115,8 +115,8 @@ void Battlenet::PacketManager::RegisterWoWRealmPackets()
     REGISTER_SERVER_PACKET(PacketHeader(WoWRealm::SMSG_LIST_SUBSCRIBE_RESPONSE, WOWREALM), WoWRealm::ListSubscribeResponse);
     REGISTER_SERVER_PACKET(PacketHeader(WoWRealm::SMSG_LIST_UPDATE, WOWREALM), WoWRealm::ListUpdate);
     REGISTER_SERVER_PACKET(PacketHeader(WoWRealm::SMSG_LIST_COMPLETE, WOWREALM), WoWRealm::ListComplete);
-    REGISTER_SERVER_PACKET_NAME(PacketHeader(WoWRealm::SMSG_TOON_READY, WOWREALM), "WoWRealm::ToonReady");
-    REGISTER_SERVER_PACKET_NAME(PacketHeader(WoWRealm::SMSG_TOON_LOGGED_OUT, WOWREALM), "WoWRealm::ToonLoggedOut");
+    REGISTER_SERVER_PACKET(PacketHeader(WoWRealm::SMSG_TOON_READY, WOWREALM), WoWRealm::ToonReady);
+    REGISTER_SERVER_PACKET(PacketHeader(WoWRealm::SMSG_TOON_LOGGED_OUT, WOWREALM), WoWRealm::ToonLoggedOut);
     REGISTER_SERVER_PACKET(PacketHeader(WoWRealm::SMSG_JOIN_RESPONSE_V2, WOWREALM), WoWRealm::JoinResponseV2);
 }
 
diff --git a/src/server/bnetserver/Packets/WoWRealmPackets.cpp b/src/server/bnetserver/Packets/WoWRealmPackets.cpp
index beeeb14895c..986152cbccb 100644
--- a/src/server/bnetserver/Packets/WoWRealmPackets.cpp
+++ b/src/server/bnetserver/Packets/WoWRealmPackets.cpp
@@ -40,6 +40,26 @@ void Battlenet::WoWRealm::ListUnsubscribe::CallHandler(Session* session)
     session->HandleListUnsubscribe(*this);
 }
 
+void Battlenet::WoWRealm::JoinRequestV2::Read()
+{
+    Realm.Battlegroup = _stream.Read<uint8>(8);
+    Realm.Index = _stream.Read<uint32>(32);
+    Realm.Region = _stream.Read<uint8>(8);
+    ClientSeed = _stream.Read<uint32>(32);
+}
+
+std::string Battlenet::WoWRealm::JoinRequestV2::ToString() const
+{
+    std::ostringstream stream;
+    stream << "Battlenet::WoWRealm::JoinRequestV2 ClientSeed " << ClientSeed << " Region " << uint32(Realm.Region) << " Battlegroup " << uint32(Realm.Battlegroup) << " Index " << Realm.Index;
+    return stream.str().c_str();
+}
+
+void Battlenet::WoWRealm::JoinRequestV2::CallHandler(Session* session)
+{
+    session->HandleJoinRequestV2(*this);
+}
+
 Battlenet::WoWRealm::ListSubscribeResponse::~ListSubscribeResponse()
 {
     for (ServerPacket* realmData : RealmData)
@@ -143,24 +163,32 @@ std::string Battlenet::WoWRealm::ListUpdate::ToString() const
     return stream.str().c_str();
 }
 
-void Battlenet::WoWRealm::JoinRequestV2::Read()
+void Battlenet::WoWRealm::ToonReady::Write()
 {
-    Realm.Battlegroup = _stream.Read<uint8>(8);
-    Realm.Index = _stream.Read<uint32>(32);
-    Realm.Region = _stream.Read<uint8>(8);
-    ClientSeed = _stream.Read<uint32>(32);
+    _stream.Write(Realm.Region, 8);
+    _stream.WriteFourCC(Game);
+    uint32 realmAddress = ((Realm.Battlegroup << 16) & 0xFF0000) | uint16(Realm.Index);
+    _stream.Write(realmAddress, 32);
+    _stream.WriteString(Name, 7, -2);
+    _stream.WriteSkip(7);
+    _stream.Write(Guid, 64);
+    _stream.WriteFourCC(Game);
+    _stream.Write(Realm.Region, 8);
+    _stream.WriteSkip(21);
+    _stream.Write(realmAddress, 32);
+    _stream.WriteSkip(9);
+    _stream.Write(0, 64);   // Unknown
+    _stream.Write(0, 32);   // Unknown
 }
 
-std::string Battlenet::WoWRealm::JoinRequestV2::ToString() const
+std::string Battlenet::WoWRealm::ToonReady::ToString() const
 {
     std::ostringstream stream;
-    stream << "Battlenet::WoWRealm::JoinRequestV2 ClientSeed " << ClientSeed << " Region " << uint32(Realm.Region) << " Battlegroup " << uint32(Realm.Battlegroup) << " Index " << Realm.Index;
-    return stream.str().c_str();
-}
+    stream << "Battlenet::WoWRealm::ToonReady" << " Game: " << Game
+        << ", Region: " << uint32(Realm.Region) << ", Battlegroup: " << uint32(Realm.Battlegroup) << ", Index: " << Realm.Index
+        << ", Guid: " << Guid << ", Name: " << Name;
 
-void Battlenet::WoWRealm::JoinRequestV2::CallHandler(Session* session)
-{
-    session->HandleJoinRequestV2(*this);
+    return stream.str().c_str();
 }
 
 void Battlenet::WoWRealm::JoinResponseV2::Write()
diff --git a/src/server/bnetserver/Packets/WoWRealmPackets.h b/src/server/bnetserver/Packets/WoWRealmPackets.h
index 2b1390a9067..b411c63100a 100644
--- a/src/server/bnetserver/Packets/WoWRealmPackets.h
+++ b/src/server/bnetserver/Packets/WoWRealmPackets.h
@@ -153,6 +153,33 @@ namespace Battlenet
             std::string ToString() const override { return "Battlenet::WoWRealm::ListComplete"; }
         };
 
+        class ToonReady final : public ServerPacket
+        {
+        public:
+            ToonReady() : ServerPacket(PacketHeader(SMSG_TOON_READY, WOWREALM)), Game("WoW"), Guid(0)
+            {
+            }
+
+            void Write() override;
+            std::string ToString() const override;
+
+            std::string Game;
+            RealmId Realm;
+            uint64 Guid;
+            std::string Name;
+        };
+
+        class ToonLoggedOut final : public ServerPacket
+        {
+        public:
+            ToonLoggedOut() : ServerPacket(PacketHeader(SMSG_TOON_LOGGED_OUT, WOWREALM))
+            {
+            }
+
+            void Write() override { }
+            std::string ToString() const override { return "Battlenet::WoWRealm::ToonLoggedOut"; }
+        };
+
         class JoinResponseV2 final : public ServerPacket
         {
         public:
diff --git a/src/server/bnetserver/Realms/RealmList.cpp b/src/server/bnetserver/Realms/RealmList.cpp
index 2bf93e12cb3..cc7e1d492a8 100644
--- a/src/server/bnetserver/Realms/RealmList.cpp
+++ b/src/server/bnetserver/Realms/RealmList.cpp
@@ -16,12 +16,21 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <boost/asio/ip/tcp.hpp>
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "SessionManager.h"
 #include "Util.h"
+#include "Commands.h"
 #include "RealmList.h"
+#include <boost/asio/ip/tcp.hpp>
+
+Battlenet::RealmId& Battlenet::RealmId::operator=(Battlenet::RealmHandle const& handle)
+{
+    Region = handle.Region;
+    Battlegroup = handle.Battlegroup;
+    Index = handle.Index;
+    return *this;
+}
 
 ip::tcp::endpoint Realm::GetAddressForClient(ip::address const& clientAddr) const
 {
@@ -58,7 +67,7 @@ ip::tcp::endpoint Realm::GetAddressForClient(ip::address const& clientAddr) cons
     return endpoint;
 }
 
-RealmList::RealmList() : _updateInterval(0), _updateTimer(nullptr), _resolver(nullptr)
+RealmList::RealmList() : _updateInterval(0), _updateTimer(nullptr), _resolver(nullptr), _worldListener(nullptr)
 {
 }
 
@@ -66,10 +75,11 @@ RealmList::~RealmList()
 {
     delete _updateTimer;
     delete _resolver;
+    delete _worldListener;
 }
 
 // Load the realm list from the database
-void RealmList::Initialize(boost::asio::io_service& ioService, uint32 updateInterval)
+void RealmList::Initialize(boost::asio::io_service& ioService, uint32 updateInterval, uint16 worldListenPort)
 {
     _updateInterval = updateInterval;
     _updateTimer = new boost::asio::deadline_timer(ioService);
@@ -77,6 +87,14 @@ void RealmList::Initialize(boost::asio::io_service& ioService, uint32 updateInte
 
     // Get the content of the realmlist table in the database
     UpdateRealms(boost::system::error_code());
+
+    _worldListener = new WorldListener(worldListenPort);
+    _worldListener->Start();
+}
+
+void RealmList::Close()
+{
+    _worldListener->End();
 }
 
 template<typename FieldType>
diff --git a/src/server/bnetserver/Realms/RealmList.h b/src/server/bnetserver/Realms/RealmList.h
index a4d3d77ff56..dc78a00dfdd 100644
--- a/src/server/bnetserver/Realms/RealmList.h
+++ b/src/server/bnetserver/Realms/RealmList.h
@@ -19,11 +19,12 @@
 #ifndef _REALMLIST_H
 #define _REALMLIST_H
 
+#include "Common.h"
+#include "WorldListener.h"
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/deadline_timer.hpp>
-#include "Common.h"
 
 using namespace boost::asio;
 
@@ -44,6 +45,8 @@ enum RealmFlags
 
 namespace Battlenet
 {
+    struct RealmHandle;
+
     struct RealmId
     {
         RealmId() : Region(0), Battlegroup(0), Index(0), Build(0) { }
@@ -59,6 +62,8 @@ namespace Battlenet
         {
             return memcmp(this, &r, sizeof(RealmId) - sizeof(Build)) < 0;
         }
+
+        RealmId& operator=(RealmHandle const& handle);
     };
 }
 
@@ -98,7 +103,8 @@ public:
 
     ~RealmList();
 
-    void Initialize(boost::asio::io_service& ioService, uint32 updateInterval);
+    void Initialize(boost::asio::io_service& ioService, uint32 updateInterval, uint16 worldListenPort);
+    void Close();
 
     RealmMap const& GetRealms() const { return _realms; }
     Realm const* GetRealm(Battlenet::RealmId const& id) const;
@@ -114,6 +120,7 @@ private:
     uint32 _updateInterval;
     boost::asio::deadline_timer* _updateTimer;
     boost::asio::ip::tcp::resolver* _resolver;
+    WorldListener* _worldListener;
 };
 
 #define sRealmList RealmList::instance()
diff --git a/src/server/bnetserver/Realms/WorldListener.cpp b/src/server/bnetserver/Realms/WorldListener.cpp
new file mode 100644
index 00000000000..30886a67310
--- /dev/null
+++ b/src/server/bnetserver/Realms/WorldListener.cpp
@@ -0,0 +1,109 @@
+/*
+ * 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/>.
+ */
+
+#include "Log.h"
+#include "SessionManager.h"
+#include "WoWRealmPackets.h"
+#include "ZmqContext.h"
+#include "WorldListener.h"
+
+WorldListener::HandlerTable const WorldListener::_handlers;
+
+WorldListener::HandlerTable::HandlerTable()
+{
+#define DEFINE_HANDLER(opc, func) _handlers[opc] = { func, #opc }
+
+    DEFINE_HANDLER(BNET_CHANGE_TOON_ONLINE_STATE, &WorldListener::HandleToonOnlineStatusChange);
+
+#undef DEFINE_HANDLER
+}
+
+WorldListener::WorldListener(uint16 worldListenPort) : _worldListenPort(worldListenPort)
+{
+    _worldSocket = sIpcContext->CreateNewSocket(zmqpp::socket_type::pull);
+}
+
+WorldListener::~WorldListener()
+{
+    delete _worldSocket;
+}
+
+void WorldListener::Run()
+{
+    while (!ProcessExit())
+    {
+        _poller->poll();
+        if (_poller->events(*_worldSocket) & zmqpp::poller::poll_in)
+        {
+            int32 op1;
+            do
+            {
+                zmqpp::message msg;
+                _worldSocket->receive(msg);
+                Dispatch(msg);
+                _worldSocket->get(zmqpp::socket_option::events, op1);
+            } while (op1 & zmqpp::poller::poll_in);
+        }
+    }
+}
+
+void WorldListener::HandleOpen()
+{
+    _worldSocket->bind(std::string("tcp://*:") + std::to_string(_worldListenPort));
+    _poller->add(*_worldSocket);
+    TC_LOG_INFO("server.ipc", "Listening on connections from worldservers...");
+}
+
+void WorldListener::HandleClose()
+{
+    _worldSocket->close();
+    TC_LOG_INFO("server.ipc", "Shutting down connections from worldservers...");
+}
+
+void WorldListener::Dispatch(zmqpp::message& msg) const
+{
+    Battlenet::Header ipcHeader;
+    msg >> ipcHeader;
+
+    if (ipcHeader.Ipc.Channel != IPC_CHANNEL_BNET)
+        return;
+
+    if (ipcHeader.Ipc.Command < IPC_BNET_MAX_COMMAND)
+        (this->*_handlers[ipcHeader.Ipc.Command].Handler)(ipcHeader.Realm, msg);
+}
+
+void WorldListener::HandleToonOnlineStatusChange(Battlenet::RealmHandle const& realm, zmqpp::message& msg) const
+{
+    Battlenet::ToonHandle toonHandle;
+    bool online;
+    msg >> toonHandle;
+    msg >> online;
+
+    if (Battlenet::Session* session = sSessionMgr.GetSession(toonHandle.AccountId, toonHandle.GameAccountId))
+    {
+        if (online)
+        {
+            Battlenet::WoWRealm::ToonReady* toonReady = new Battlenet::WoWRealm::ToonReady();
+            toonReady->Realm = realm;
+            toonReady->Guid = toonHandle.Guid;
+            toonReady->Name = toonHandle.Name;
+            session->AsyncWrite(toonReady);
+        }
+        else
+            session->AsyncWrite(new Battlenet::WoWRealm::ToonLoggedOut());
+    }
+}
diff --git a/src/server/bnetserver/Realms/WorldListener.h b/src/server/bnetserver/Realms/WorldListener.h
new file mode 100644
index 00000000000..04d5342449c
--- /dev/null
+++ b/src/server/bnetserver/Realms/WorldListener.h
@@ -0,0 +1,63 @@
+/*
+ * 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 WorldListener_h__
+#define WorldListener_h__
+
+#include "ZMQTask.h"
+#include "Commands.h"
+
+class WorldListener : public ZMQTask
+{
+public:
+    explicit WorldListener(uint16 worldListenPort);
+    ~WorldListener();
+    void Run() override;
+
+protected:
+    void HandleOpen() override;
+    void HandleClose() override;
+
+private:
+    void Dispatch(zmqpp::message& msg) const;
+
+    typedef void(WorldListener::*PacketHandler)(Battlenet::RealmHandle const& realm, zmqpp::message& msg) const;
+    class HandlerTable
+    {
+    public:
+        HandlerTable();
+
+        struct HandlerInfo
+        {
+            PacketHandler Handler;
+            char const* Name;
+        };
+
+        HandlerInfo const& operator[](uint8 opcode) const { return _handlers[opcode]; }
+
+    private:
+        HandlerInfo _handlers[IPC_BNET_MAX_COMMAND];
+    };
+
+    void HandleToonOnlineStatusChange(Battlenet::RealmHandle const& realm, zmqpp::message& msg) const;
+
+    zmqpp::socket* _worldSocket;
+    uint16 _worldListenPort;
+    static HandlerTable const _handlers;
+};
+
+#endif // WorldListener_h__
diff --git a/src/server/bnetserver/Server/Session.h b/src/server/bnetserver/Server/Session.h
index a2c587841a4..c932115a04b 100644
--- a/src/server/bnetserver/Server/Session.h
+++ b/src/server/bnetserver/Server/Session.h
@@ -93,9 +93,9 @@ namespace Battlenet
 
         bool IsSubscribedToRealmListUpdates() const { return _subscribedToRealmListUpdates; }
 
-    protected:
         void AsyncWrite(ServerPacket* packet);
 
+    protected:
         void ReadHandler() override;
 
     private:
diff --git a/src/server/bnetserver/Server/SessionManager.cpp b/src/server/bnetserver/Server/SessionManager.cpp
index 8dcee55ec6c..9e5836dab8d 100644
--- a/src/server/bnetserver/Server/SessionManager.cpp
+++ b/src/server/bnetserver/Server/SessionManager.cpp
@@ -49,3 +49,22 @@ void Battlenet::SessionManager::RemoveSession(Session* session)
     _sessions.erase({ session->GetAccountId(), session->GetGameAccountId() });
     _sessionsByAccountId[session->GetAccountId()].remove(session);
 }
+
+Battlenet::Session* Battlenet::SessionManager::GetSession(uint32 accountId, uint32 gameAccountId) const
+{
+    auto itr = _sessions.find({ accountId, gameAccountId });
+    if (itr != _sessions.end())
+        return itr->second;
+
+    return nullptr;
+}
+
+std::list<Battlenet::Session*> Battlenet::SessionManager::GetSessions(uint32 accountId) const
+{
+    std::list<Session*> sessions;
+    auto itr = _sessionsByAccountId.find(accountId);
+    if (itr != _sessionsByAccountId.end())
+        sessions = itr->second;
+
+    return sessions;
+}
diff --git a/src/server/bnetserver/Server/SessionManager.h b/src/server/bnetserver/Server/SessionManager.h
index bbd78c052d2..08ca5ce2b4e 100644
--- a/src/server/bnetserver/Server/SessionManager.h
+++ b/src/server/bnetserver/Server/SessionManager.h
@@ -60,6 +60,9 @@ namespace Battlenet
 
         void RemoveSession(Session* /*session*/);
 
+        Session* GetSession(uint32 accountId, uint32 gameAccountId) const;
+        std::list<Session*> GetSessions(uint32 accountId) const;
+
         template<typename Iterator>
         void LockedForEach(Iterator iterator)
         {
diff --git a/src/server/bnetserver/bnetserver.conf.dist b/src/server/bnetserver/bnetserver.conf.dist
index 84456c117b3..102ddb9906a 100644
--- a/src/server/bnetserver/bnetserver.conf.dist
+++ b/src/server/bnetserver/bnetserver.conf.dist
@@ -47,6 +47,13 @@ LogsDir = ""
 MaxPingTime = 30
 
 #
+#    WorldserverListenPort
+#        Description: TCP port to listen on for incoming worldserver IPC.
+#        Default:     1118
+
+WorldserverListenPort = 1118
+
+#
 #    BattlenetPort
 #        Description: TCP port to reach the auth server for battle.net connections.
 #        Default:     1119