aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/shared/Realm/Realm.cpp6
-rw-r--r--src/server/shared/Realm/Realm.h10
-rw-r--r--src/server/shared/Realm/RealmList.cpp16
-rw-r--r--src/server/shared/Realm/RealmList.h6
-rw-r--r--src/server/worldserver/Main.cpp6
5 files changed, 20 insertions, 24 deletions
diff --git a/src/server/shared/Realm/Realm.cpp b/src/server/shared/Realm/Realm.cpp
index 11ff56acc8b..2768e17848b 100644
--- a/src/server/shared/Realm/Realm.cpp
+++ b/src/server/shared/Realm/Realm.cpp
@@ -17,9 +17,9 @@
#include "Realm.h"
-ip::tcp::endpoint Realm::GetAddressForClient(ip::address const& clientAddr) const
+boost::asio::ip::tcp::endpoint Realm::GetAddressForClient(boost::asio::ip::address const& clientAddr) const
{
- ip::address realmIp;
+ boost::asio::ip::address realmIp;
// Attempt to send best address for client
if (clientAddr.is_loopback())
@@ -46,7 +46,7 @@ ip::tcp::endpoint Realm::GetAddressForClient(ip::address const& clientAddr) cons
realmIp = ExternalAddress;
}
- ip::tcp::endpoint endpoint(realmIp, Port);
+ boost::asio::ip::tcp::endpoint endpoint(realmIp, Port);
// Return external IP
return endpoint;
diff --git a/src/server/shared/Realm/Realm.h b/src/server/shared/Realm/Realm.h
index 32c1909f6ac..e3cf181c120 100644
--- a/src/server/shared/Realm/Realm.h
+++ b/src/server/shared/Realm/Realm.h
@@ -22,8 +22,6 @@
#include <boost/asio/ip/address.hpp>
#include <boost/asio/ip/tcp.hpp>
-using namespace boost::asio;
-
enum RealmFlags
{
REALM_FLAG_NONE = 0x00,
@@ -70,9 +68,9 @@ struct TC_SHARED_API Realm
{
RealmHandle Id;
uint32 Build;
- ip::address ExternalAddress;
- ip::address LocalAddress;
- ip::address LocalSubnetMask;
+ boost::asio::ip::address ExternalAddress;
+ boost::asio::ip::address LocalAddress;
+ boost::asio::ip::address LocalSubnetMask;
uint16 Port;
std::string Name;
uint8 Type;
@@ -81,7 +79,7 @@ struct TC_SHARED_API Realm
AccountTypes AllowedSecurityLevel;
float PopulationLevel;
- ip::tcp::endpoint GetAddressForClient(ip::address const& clientAddr) const;
+ boost::asio::ip::tcp::endpoint GetAddressForClient(boost::asio::ip::address const& clientAddr) const;
};
#endif // Realm_h__
diff --git a/src/server/shared/Realm/RealmList.cpp b/src/server/shared/Realm/RealmList.cpp
index 6c225560a53..37dd6bbaa17 100644
--- a/src/server/shared/Realm/RealmList.cpp
+++ b/src/server/shared/Realm/RealmList.cpp
@@ -51,8 +51,8 @@ void RealmList::Close()
_updateTimer->cancel();
}
-void RealmList::UpdateRealm(RealmHandle const& id, uint32 build, const std::string& name, ip::address const& address, ip::address const& localAddr,
- ip::address const& localSubmask, uint16 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel,
+void RealmList::UpdateRealm(RealmHandle const& id, uint32 build, const std::string& name, boost::asio::ip::address const& address, boost::asio::ip::address const& localAddr,
+ boost::asio::ip::address const& localSubmask, uint16 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel,
float population)
{
// Create new if not exist or update existed
@@ -100,7 +100,7 @@ void RealmList::UpdateRealms(boost::system::error_code const& error)
Field* fields = result->Fetch();
uint32 realmId = fields[0].GetUInt32();
std::string name = fields[1].GetString();
- boost::asio::ip::tcp::resolver::query externalAddressQuery(ip::tcp::v4(), fields[2].GetString(), "");
+ boost::asio::ip::tcp::resolver::query externalAddressQuery(boost::asio::ip::tcp::v4(), fields[2].GetString(), "");
boost::system::error_code ec;
boost::asio::ip::tcp::resolver::iterator endPoint = _resolver->resolve(externalAddressQuery, ec);
@@ -110,9 +110,9 @@ void RealmList::UpdateRealms(boost::system::error_code const& error)
continue;
}
- ip::address externalAddress = (*endPoint).endpoint().address();
+ boost::asio::ip::address externalAddress = (*endPoint).endpoint().address();
- boost::asio::ip::tcp::resolver::query localAddressQuery(ip::tcp::v4(), fields[3].GetString(), "");
+ boost::asio::ip::tcp::resolver::query localAddressQuery(boost::asio::ip::tcp::v4(), fields[3].GetString(), "");
endPoint = _resolver->resolve(localAddressQuery, ec);
if (endPoint == end || ec)
{
@@ -120,9 +120,9 @@ void RealmList::UpdateRealms(boost::system::error_code const& error)
continue;
}
- ip::address localAddress = (*endPoint).endpoint().address();
+ boost::asio::ip::address localAddress = (*endPoint).endpoint().address();
- boost::asio::ip::tcp::resolver::query localSubmaskQuery(ip::tcp::v4(), fields[4].GetString(), "");
+ boost::asio::ip::tcp::resolver::query localSubmaskQuery(boost::asio::ip::tcp::v4(), fields[4].GetString(), "");
endPoint = _resolver->resolve(localSubmaskQuery, ec);
if (endPoint == end || ec)
{
@@ -130,7 +130,7 @@ void RealmList::UpdateRealms(boost::system::error_code const& error)
continue;
}
- ip::address localSubmask = (*endPoint).endpoint().address();
+ boost::asio::ip::address localSubmask = (*endPoint).endpoint().address();
uint16 port = fields[5].GetUInt16();
uint8 icon = fields[6].GetUInt8();
diff --git a/src/server/shared/Realm/RealmList.h b/src/server/shared/Realm/RealmList.h
index c3209be0d99..7878779b736 100644
--- a/src/server/shared/Realm/RealmList.h
+++ b/src/server/shared/Realm/RealmList.h
@@ -26,8 +26,6 @@
#include <boost/asio/io_service.hpp>
#include <boost/asio/deadline_timer.hpp>
-using namespace boost::asio;
-
/// Storage object for the list of realms on the server
class TC_SHARED_API RealmList
{
@@ -48,8 +46,8 @@ private:
RealmList();
void UpdateRealms(boost::system::error_code const& error);
- void UpdateRealm(RealmHandle const& id, uint32 build, const std::string& name, ip::address const& address, ip::address const& localAddr,
- ip::address const& localSubmask, uint16 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float population);
+ void UpdateRealm(RealmHandle const& id, uint32 build, const std::string& name, boost::asio::ip::address const& address, boost::asio::ip::address const& localAddr,
+ boost::asio::ip::address const& localSubmask, uint16 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float population);
RealmMap _realms;
uint32 _updateInterval;
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 1d8b2980b28..df8bc252939 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -474,7 +474,7 @@ bool LoadRealmInfo()
Field* fields = result->Fetch();
realm.Name = fields[1].GetString();
- boost::asio::ip::tcp::resolver::query externalAddressQuery(ip::tcp::v4(), fields[2].GetString(), "");
+ boost::asio::ip::tcp::resolver::query externalAddressQuery(boost::asio::ip::tcp::v4(), fields[2].GetString(), "");
boost::system::error_code ec;
boost::asio::ip::tcp::resolver::iterator endPoint = resolver.resolve(externalAddressQuery, ec);
@@ -486,7 +486,7 @@ bool LoadRealmInfo()
realm.ExternalAddress = (*endPoint).endpoint().address();
- boost::asio::ip::tcp::resolver::query localAddressQuery(ip::tcp::v4(), fields[3].GetString(), "");
+ boost::asio::ip::tcp::resolver::query localAddressQuery(boost::asio::ip::tcp::v4(), fields[3].GetString(), "");
endPoint = resolver.resolve(localAddressQuery, ec);
if (endPoint == end || ec)
{
@@ -496,7 +496,7 @@ bool LoadRealmInfo()
realm.LocalAddress = (*endPoint).endpoint().address();
- boost::asio::ip::tcp::resolver::query localSubmaskQuery(ip::tcp::v4(), fields[4].GetString(), "");
+ boost::asio::ip::tcp::resolver::query localSubmaskQuery(boost::asio::ip::tcp::v4(), fields[4].GetString(), "");
endPoint = resolver.resolve(localSubmaskQuery, ec);
if (endPoint == end || ec)
{