Core: Updated to 6.2.4

* Rewrite bnetserver for new authentication protocol

3 files changed, 17 insertions, 2 deletions

diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 7fb4c6d2b75..66555f99915 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -48,7 +48,6 @@ set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAG
 target_link_libraries(worldserver
   PUBLIC
     scripts
-    gsoap
     readline)
 
 CollectIncludeDirectories(
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 767fe322056..9ed76d186be 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -41,7 +41,7 @@
 #include "GitRevision.h"
 #include "WorldSocket.h"
 #include "WorldSocketMgr.h"
-#include "Realm/Realm.h"
+#include "RealmList.h"
 #include "DatabaseLoader.h"
 #include "AppenderDB.h"
 #include <openssl/opensslv.h>
@@ -49,6 +49,7 @@
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/deadline_timer.hpp>
 #include <boost/program_options.hpp>
+#include <google/protobuf/stubs/common.h>
 
 using namespace boost::program_options;
 
@@ -103,6 +104,8 @@ extern int main(int argc, char** argv)
     if (vm.count("help") || vm.count("version"))
         return 0;
 
+    GOOGLE_PROTOBUF_VERIFY_VERSION;
+
 #ifdef _WIN32
     if (configService.compare("install") == 0)
         return WinServiceInstall() ? 0 : 1;
@@ -188,6 +191,8 @@ extern int main(int argc, char** argv)
     // Set server offline (not connectable)
     LoginDatabase.DirectPExecute("UPDATE realmlist SET flag = flag | %u WHERE id = '%d'", REALM_FLAG_OFFLINE, realm.Id.Realm);
 
+    sRealmList->Initialize(_ioService, sConfigMgr->GetIntDefault("RealmsStateUpdateDelay", 10));
+
     LoadRealmInfo();
 
     // Initialize the World
@@ -273,6 +278,7 @@ extern int main(int argc, char** argv)
 
     // set server offline
     LoginDatabase.DirectPExecute("UPDATE realmlist SET flag = flag | %u WHERE id = '%d'", REALM_FLAG_OFFLINE, realm.Id.Realm);
+    sRealmList->Close();
 
     // Clean up threads if any
     if (soapThread != nullptr)
@@ -294,6 +300,8 @@ extern int main(int argc, char** argv)
 
     OpenSSLCrypto::threadsCleanup();
 
+    google::protobuf::ShutdownProtobufLibrary();
+
     // 0 - normal shutdown
     // 1 - shutdown at error
     // 2 - restart command used, this code can be used by restarter for restart Trinityd
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 532450167e9..cb93b1b90b6 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -240,6 +240,14 @@ UseProcessors = 0
 ProcessPriority = 0
 
 #
+#    RealmsStateUpdateDelay
+#        Description: Time (in seconds) between realm list updates.
+#        Default:     10
+#                     0  - (Disabled)
+
+RealmsStateUpdateDelay = 10
+
+#
 #    Compression
 #        Description: Compression level for client update packages.
 #        Range:       1-9