From 6be536a73bc8a6e331ce20e7d19e2ea56b99b4d0 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 15 Jul 2023 00:45:16 +0200 Subject: Core/Network: Refactor local/remote ip address selection code and allow using hostnames in LoginREST bnetserver config options --- src/server/worldserver/Main.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/server/worldserver/Main.cpp') diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index d56fa0156da..013b4b0f977 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -34,10 +34,10 @@ #include "GitRevision.h" #include "InstanceLockMgr.h" #include "IoContext.h" +#include "IpNetwork.h" #include "MapManager.h" #include "Metric.h" #include "MySQLThreading.h" -#include "ObjectAccessor.h" #include "OpenSSLCrypto.h" #include "OutdoorPvP/OutdoorPvPMgr.h" #include "ProcessPriority.h" @@ -290,6 +290,8 @@ extern int main(int argc, char** argv) if (vm.count("update-databases-only")) return 0; + Trinity::Net::ScanLocalNetworks(); + // Set server offline (not connectable) LoginDatabase.DirectPExecute("UPDATE realmlist SET flag = flag | {} WHERE id = '{}'", REALM_FLAG_OFFLINE, realm.Id.Realm); @@ -619,7 +621,6 @@ bool LoadRealmInfo() realm.Build = realmListRealm->Build; realm.ExternalAddress = std::make_unique(*realmListRealm->ExternalAddress); realm.LocalAddress = std::make_unique(*realmListRealm->LocalAddress); - realm.LocalSubnetMask = std::make_unique(*realmListRealm->LocalSubnetMask); realm.Port = realmListRealm->Port; realm.Name = realmListRealm->Name; realm.NormalizedName = realmListRealm->NormalizedName; -- cgit v1.2.3