From db6be5927fd872b384698d7988f3e2d616b9ac5e Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 25 Jul 2014 20:13:13 +0200 Subject: [PATCH 1/3] Core/Realmlist: Force resolving realm addresses to ipv4 Closes #12640 --- src/server/authserver/Realms/RealmList.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp index b5668da2028..43ed4cecca8 100644 --- a/src/server/authserver/Realms/RealmList.cpp +++ b/src/server/authserver/Realms/RealmList.cpp @@ -96,7 +96,7 @@ void RealmList::UpdateRealms(bool init) Field* fields = result->Fetch(); uint32 realmId = fields[0].GetUInt32(); std::string name = fields[1].GetString(); - boost::asio::ip::tcp::resolver::query externalAddressQuery(fields[2].GetString(), ""); + boost::asio::ip::tcp::resolver::query externalAddressQuery(tcp::v4(), fields[2].GetString(), ""); boost::asio::ip::tcp::resolver::iterator endPoint = _resolver->resolve(externalAddressQuery); if (endPoint == end) { @@ -106,7 +106,7 @@ void RealmList::UpdateRealms(bool init) ip::address externalAddress = (*endPoint).endpoint().address(); - boost::asio::ip::tcp::resolver::query localAddressQuery(fields[3].GetString(), ""); + boost::asio::ip::tcp::resolver::query localAddressQuery(tcp::v4(), fields[3].GetString(), ""); endPoint = _resolver->resolve(localAddressQuery); if (endPoint == end) { @@ -116,7 +116,7 @@ void RealmList::UpdateRealms(bool init) ip::address localAddress = (*endPoint).endpoint().address(); - boost::asio::ip::tcp::resolver::query localSubmaskQuery(fields[4].GetString(), ""); + boost::asio::ip::tcp::resolver::query localSubmaskQuery(tcp::v4(), fields[4].GetString(), ""); endPoint = _resolver->resolve(localSubmaskQuery); if (endPoint == end) { From dcfa3bfa90d25d8cf7207af3210a821b609b521d Mon Sep 17 00:00:00 2001 From: DDuarte Date: Fri, 25 Jul 2014 19:49:43 +0100 Subject: [PATCH 2/3] Core/Network: Fix build --- src/server/authserver/Server/AuthSession.cpp | 3 ++- src/server/game/Server/WorldSocket.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/authserver/Server/AuthSession.cpp b/src/server/authserver/Server/AuthSession.cpp index cad82a80a07..913e624635c 100644 --- a/src/server/authserver/Server/AuthSession.cpp +++ b/src/server/authserver/Server/AuthSession.cpp @@ -941,5 +941,6 @@ void AuthSession::CloseSocket() boost::system::error_code socketError; _socket.close(socketError); if (socketError) - TC_LOG_DEBUG("server.authserver", "Account '%s' errored when closing socket: %i (%s)", _login.c_str(), socketError.value(), socketError.message()); + TC_LOG_DEBUG("server.authserver", "Account '%s' errored when closing socket: %i (%s)", + _login.c_str(), socketError.value(), socketError.message().c_str()); } diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 682ea320365..575c145687c 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -508,5 +508,5 @@ void WorldSocket::CloseSocket() if (socketError) TC_LOG_DEBUG("network", "WorldSocket::CloseSocket: Player '%s' (%s) errored when closing socket: %i (%s)", _worldSession ? _worldSession->GetPlayerInfo().c_str() : "unknown", GetRemoteIpAddress().c_str(), - socketError.value(), socketError.message()); + socketError.value(), socketError.message().c_str()); } From e516265703cb7acc4cc05b12a3455017a9fc527b Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Fri, 25 Jul 2014 21:52:41 +0200 Subject: [PATCH 3/3] Core: Fix non pch build --- src/server/authserver/Realms/RealmList.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp index 43ed4cecca8..c8369273331 100644 --- a/src/server/authserver/Realms/RealmList.cpp +++ b/src/server/authserver/Realms/RealmList.cpp @@ -96,7 +96,7 @@ void RealmList::UpdateRealms(bool init) Field* fields = result->Fetch(); uint32 realmId = fields[0].GetUInt32(); std::string name = fields[1].GetString(); - boost::asio::ip::tcp::resolver::query externalAddressQuery(tcp::v4(), fields[2].GetString(), ""); + boost::asio::ip::tcp::resolver::query externalAddressQuery(ip::tcp::v4(), fields[2].GetString(), ""); boost::asio::ip::tcp::resolver::iterator endPoint = _resolver->resolve(externalAddressQuery); if (endPoint == end) { @@ -106,7 +106,7 @@ void RealmList::UpdateRealms(bool init) ip::address externalAddress = (*endPoint).endpoint().address(); - boost::asio::ip::tcp::resolver::query localAddressQuery(tcp::v4(), fields[3].GetString(), ""); + boost::asio::ip::tcp::resolver::query localAddressQuery(ip::tcp::v4(), fields[3].GetString(), ""); endPoint = _resolver->resolve(localAddressQuery); if (endPoint == end) { @@ -116,7 +116,7 @@ void RealmList::UpdateRealms(bool init) ip::address localAddress = (*endPoint).endpoint().address(); - boost::asio::ip::tcp::resolver::query localSubmaskQuery(tcp::v4(), fields[4].GetString(), ""); + boost::asio::ip::tcp::resolver::query localSubmaskQuery(ip::tcp::v4(), fields[4].GetString(), ""); endPoint = _resolver->resolve(localSubmaskQuery); if (endPoint == end) {