diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-25 21:53:35 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-25 21:53:35 +0200 |
| commit | 7f7987707be41766f74d40aa396a86fb840fcf28 (patch) | |
| tree | ad0c1377d4a8e63d7013a4e21fb63df2ee6b1c99 /src | |
| parent | 5a8e79528f06d8dabe1d038d8e079be29adf7e1e (diff) | |
| parent | e516265703cb7acc4cc05b12a3455017a9fc527b (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/authserver/Realms/RealmList.cpp | 6 | ||||
| -rw-r--r-- | src/server/authserver/Server/AuthSession.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSocket.cpp | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/server/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp index bea775d9d83..5a03109f717 100644 --- a/src/server/authserver/Realms/RealmList.cpp +++ b/src/server/authserver/Realms/RealmList.cpp @@ -136,7 +136,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(ip::tcp::v4(), fields[2].GetString(), ""); boost::asio::ip::tcp::resolver::iterator endPoint = _resolver->resolve(externalAddressQuery); if (endPoint == end) { @@ -146,7 +146,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(ip::tcp::v4(), fields[3].GetString(), ""); endPoint = _resolver->resolve(localAddressQuery); if (endPoint == end) { @@ -156,7 +156,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(ip::tcp::v4(), fields[4].GetString(), ""); endPoint = _resolver->resolve(localSubmaskQuery); if (endPoint == end) { diff --git a/src/server/authserver/Server/AuthSession.cpp b/src/server/authserver/Server/AuthSession.cpp index 7d2948470f7..446b0a43158 100644 --- a/src/server/authserver/Server/AuthSession.cpp +++ b/src/server/authserver/Server/AuthSession.cpp @@ -895,5 +895,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 fa83db6b185..7dad289d1e9 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -587,5 +587,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()); } |