From 893f2d4cef5b0ee619a04ef6208ef0c1b974c8a3 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 12 Nov 2024 13:54:43 +0100 Subject: Core/Networking: Support IPv6 (cherry picked from commit af4dcc93ed04c4f2219c14821b25cb9efeb7e781) # Conflicts: # sql/base/auth_database.sql # sql/updates/auth/cata_classic/2024_11_12_00_auth.sql --- src/server/shared/Realm/Realm.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/shared/Realm/Realm.cpp') diff --git a/src/server/shared/Realm/Realm.cpp b/src/server/shared/Realm/Realm.cpp index 42ac0c3f64b..c06a53dfe9c 100644 --- a/src/server/shared/Realm/Realm.cpp +++ b/src/server/shared/Realm/Realm.cpp @@ -26,7 +26,7 @@ void Realm::SetName(std::string name) { Name = name; NormalizedName = std::move(name); - NormalizedName.erase(std::remove_if(NormalizedName.begin(), NormalizedName.end(), ::isspace), NormalizedName.end()); + std::erase_if(NormalizedName, [](char c) { return std::isspace(static_cast(c)); }); } boost::asio::ip::address Realm::GetAddressForClient(boost::asio::ip::address const& clientAddr) const @@ -34,7 +34,7 @@ boost::asio::ip::address Realm::GetAddressForClient(boost::asio::ip::address con if (auto addressIndex = Trinity::Net::SelectAddressForClient(clientAddr, Addresses)) return Addresses[*addressIndex]; - if (clientAddr.is_loopback()) + if (Addresses.size() > 1 && clientAddr.is_loopback()) return Addresses[1]; return Addresses[0]; -- cgit v1.2.3