aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/server')
-rw-r--r--src/server/shared/Realm/RealmList.cpp15
-rw-r--r--src/server/shared/Realm/RealmList.h11
-rw-r--r--src/server/worldserver/Main.cpp8
3 files changed, 11 insertions, 23 deletions
diff --git a/src/server/shared/Realm/RealmList.cpp b/src/server/shared/Realm/RealmList.cpp
index a59af781352..f2e2e457f5a 100644
--- a/src/server/shared/Realm/RealmList.cpp
+++ b/src/server/shared/Realm/RealmList.cpp
@@ -28,9 +28,7 @@ RealmList::RealmList() : _updateInterval(0)
{
}
-RealmList::~RealmList()
-{
-}
+RealmList::~RealmList() = default;
RealmList* RealmList::Instance()
{
@@ -43,7 +41,7 @@ void RealmList::Initialize(Trinity::Asio::IoContext& ioContext, uint32 updateInt
{
_updateInterval = updateInterval;
_updateTimer = std::make_unique<Trinity::Asio::DeadlineTimer>(ioContext);
- _resolver = std::make_unique<boost::asio::ip::tcp::resolver>(ioContext);
+ _resolver = std::make_unique<Trinity::Asio::Resolver>(ioContext);
LoadBuildInfo();
// Get the content of the realmlist table in the database
@@ -63,8 +61,7 @@ void RealmList::LoadBuildInfo()
do
{
Field* fields = result->Fetch();
- _builds.emplace_back();
- RealmBuildInfo& build = _builds.back();
+ RealmBuildInfo& build = _builds.emplace_back();
build.MajorVersion = fields[0].GetUInt32();
build.MinorVersion = fields[1].GetUInt32();
build.BugfixVersion = fields[2].GetUInt32();
@@ -141,21 +138,21 @@ void RealmList::UpdateRealms(boost::system::error_code const& error)
std::string localAddressString = fields[3].GetString();
std::string localSubmaskString = fields[4].GetString();
- Optional<boost::asio::ip::tcp::endpoint> externalAddress = Trinity::Net::Resolve(*_resolver, boost::asio::ip::tcp::v4(), externalAddressString, "");
+ Optional<boost::asio::ip::tcp::endpoint> externalAddress = _resolver->Resolve(boost::asio::ip::tcp::v4(), externalAddressString, "");
if (!externalAddress)
{
TC_LOG_ERROR("server.authserver", "Could not resolve address %s for realm \"%s\" id %u", externalAddressString.c_str(), name.c_str(), realmId);
continue;
}
- Optional<boost::asio::ip::tcp::endpoint> localAddress = Trinity::Net::Resolve(*_resolver, boost::asio::ip::tcp::v4(), localAddressString, "");
+ Optional<boost::asio::ip::tcp::endpoint> localAddress = _resolver->Resolve(boost::asio::ip::tcp::v4(), localAddressString, "");
if (!localAddress)
{
TC_LOG_ERROR("server.authserver", "Could not resolve localAddress %s for realm \"%s\" id %u", localAddressString.c_str(), name.c_str(), realmId);
continue;
}
- Optional<boost::asio::ip::tcp::endpoint> localSubmask = Trinity::Net::Resolve(*_resolver, boost::asio::ip::tcp::v4(), localSubmaskString, "");
+ Optional<boost::asio::ip::tcp::endpoint> localSubmask = _resolver->Resolve(boost::asio::ip::tcp::v4(), localSubmaskString, "");
if (!localSubmask)
{
TC_LOG_ERROR("server.authserver", "Could not resolve localSubnetMask %s for realm \"%s\" id %u", localSubmaskString.c_str(), name.c_str(), realmId);
diff --git a/src/server/shared/Realm/RealmList.h b/src/server/shared/Realm/RealmList.h
index e2b429d97e4..b5ef9c33b7b 100644
--- a/src/server/shared/Realm/RealmList.h
+++ b/src/server/shared/Realm/RealmList.h
@@ -44,15 +44,6 @@ namespace boost
}
}
-namespace Trinity
-{
- namespace Asio
- {
- class IoContext;
- class DeadlineTimer;
- }
-}
-
/// Storage object for the list of realms on the server
class TC_SHARED_API RealmList
{
@@ -84,7 +75,7 @@ private:
RealmMap _realms;
uint32 _updateInterval;
std::unique_ptr<Trinity::Asio::DeadlineTimer> _updateTimer;
- std::unique_ptr<boost::asio::ip::tcp_resolver> _resolver;
+ std::unique_ptr<Trinity::Asio::Resolver> _resolver;
};
#define sRealmList RealmList::Instance()
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 98dc8913c45..241c9ee462b 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -517,11 +517,11 @@ bool LoadRealmInfo(Trinity::Asio::IoContext& ioContext)
if (!result)
return false;
- boost::asio::ip::tcp::resolver resolver(ioContext);
+ Trinity::Asio::Resolver resolver(ioContext);
Field* fields = result->Fetch();
realm.Name = fields[1].GetString();
- Optional<boost::asio::ip::tcp::endpoint> externalAddress = Trinity::Net::Resolve(resolver, boost::asio::ip::tcp::v4(), fields[2].GetString(), "");
+ Optional<boost::asio::ip::tcp::endpoint> externalAddress = resolver.Resolve(boost::asio::ip::tcp::v4(), fields[2].GetString(), "");
if (!externalAddress)
{
TC_LOG_ERROR("server.worldserver", "Could not resolve address %s", fields[2].GetString().c_str());
@@ -530,7 +530,7 @@ bool LoadRealmInfo(Trinity::Asio::IoContext& ioContext)
realm.ExternalAddress = std::make_unique<boost::asio::ip::address>(externalAddress->address());
- Optional<boost::asio::ip::tcp::endpoint> localAddress = Trinity::Net::Resolve(resolver, boost::asio::ip::tcp::v4(), fields[3].GetString(), "");
+ Optional<boost::asio::ip::tcp::endpoint> localAddress = resolver.Resolve(boost::asio::ip::tcp::v4(), fields[3].GetString(), "");
if (!localAddress)
{
TC_LOG_ERROR("server.worldserver", "Could not resolve address %s", fields[3].GetString().c_str());
@@ -539,7 +539,7 @@ bool LoadRealmInfo(Trinity::Asio::IoContext& ioContext)
realm.LocalAddress = std::make_unique<boost::asio::ip::address>(localAddress->address());
- Optional<boost::asio::ip::tcp::endpoint> localSubmask = Trinity::Net::Resolve(resolver, boost::asio::ip::tcp::v4(), fields[4].GetString(), "");
+ Optional<boost::asio::ip::tcp::endpoint> localSubmask = resolver.Resolve(boost::asio::ip::tcp::v4(), fields[4].GetString(), "");
if (!localSubmask)
{
TC_LOG_ERROR("server.worldserver", "Could not resolve address %s", fields[4].GetString().c_str());