Core/Authserver: Refactoring - moved GetAddressForClient to Realm structure, changed BigNumber string methods to return std::string, added missing prepared statement

2 files changed, 22 insertions, 1 deletions

diff --git a/src/server/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp
index bd856623faf..48b7a178c2d 100644
--- a/src/server/authserver/Realms/RealmList.cpp
+++ b/src/server/authserver/Realms/RealmList.cpp
@@ -20,8 +20,27 @@
 #include "RealmList.h"
 #include "BattlenetManager.h"
 #include "Database/DatabaseEnv.h"
+#include "Util.h"
 
-RealmList::RealmList() : m_UpdateInterval(0), m_NextUpdateTime(time(NULL)) { }
+ACE_INET_Addr const& Realm::GetAddressForClient(ACE_INET_Addr const& clientAddr) const
+{
+    // Attempt to send best address for client
+    if (clientAddr.is_loopback())
+        // Assume that user connecting from the machine that authserver is located on
+        // has all realms available in his local network
+        return LocalAddress;
+
+    // Check if connecting client is in the same network
+    if (IsIPAddrInNetwork(LocalAddress, clientAddr, LocalSubnetMask))
+        return LocalAddress;
+
+    // Return external IP
+    return ExternalAddress;
+}
+
+RealmList::RealmList() : m_UpdateInterval(0), m_NextUpdateTime(time(NULL))
+{
+}
 
 // Load the realm list from the database
 void RealmList::Initialize(uint32 updateInterval)
diff --git a/src/server/authserver/Realms/RealmList.h b/src/server/authserver/Realms/RealmList.h
index ab453720827..c4a6b4eaa0b 100644
--- a/src/server/authserver/Realms/RealmList.h
+++ b/src/server/authserver/Realms/RealmList.h
@@ -53,6 +53,8 @@ struct Realm
     uint32 gamebuild;
     uint8 Region;
     uint8 Battlegroup;
+
+    ACE_INET_Addr const& GetAddressForClient(ACE_INET_Addr const& clientAddr) const;
 };
 
 namespace Battlenet