From 10fa49f5bd8cafbc7ddbb45c58a43b120d182b7c Mon Sep 17 00:00:00 2001
From: Kargatum <dowlandtop@yandex.com>
Date: Thu, 25 Mar 2021 09:09:13 +0700
Subject: [PATCH] feat(Core/Sockets): replace ACE_ASSERT to default core ASSERT
 (#4950)

---
 src/server/game/Server/WorldSocket.cpp        | 27 +++++++++----------
 src/server/game/Server/WorldSocketMgr.cpp     |  4 +--
 .../worldserver/RemoteAccess/RASocket.cpp     |  6 ++---
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index e2b2c20b3..a367a4f22 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -167,11 +167,11 @@ int WorldSocket::SendPacket(WorldPacket const& pct)
     {
         // Put the packet on the buffer.
         if (m_OutBuffer->copy((char*) header.header, header.getHeaderLength()) == -1)
-            ACE_ASSERT (false);
+            ABORT();
 
         if (!pct.empty())
             if (m_OutBuffer->copy((char*) pct.contents(), pct.size()) == -1)
-                ACE_ASSERT (false);
+                ABORT();
     }
     else
     {
@@ -463,9 +463,8 @@ int WorldSocket::Update(void)
 
 int WorldSocket::handle_input_header(void)
 {
-    ACE_ASSERT (m_RecvWPct == nullptr);
-
-    ACE_ASSERT (m_Header.length() == sizeof(ClientPktHeader));
+    ASSERT(m_RecvWPct == nullptr);
+    ASSERT(m_Header.length() == sizeof(ClientPktHeader));
 
     if (m_Crypt.IsInitialized())
         m_Crypt.DecryptRecv((uint8*) m_Header.rd_ptr(), sizeof(ClientPktHeader));
@@ -495,7 +494,7 @@ int WorldSocket::handle_input_header(void)
     }
     else
     {
-        ACE_ASSERT(m_RecvPct.space() == 0);
+        ASSERT(m_RecvPct.space() == 0);
     }
 
     return 0;
@@ -506,9 +505,9 @@ int WorldSocket::handle_input_payload(void)
     // set errno properly here on error !!!
     // now have a header and payload
 
-    ACE_ASSERT (m_RecvPct.space() == 0);
-    ACE_ASSERT (m_Header.space() == 0);
-    ACE_ASSERT (m_RecvWPct != nullptr);
+    ASSERT(m_RecvPct.space() == 0);
+    ASSERT(m_Header.space() == 0);
+    ASSERT(m_RecvWPct != nullptr);
 
     const int ret = ProcessIncoming (m_RecvWPct);
 
@@ -562,7 +561,7 @@ int WorldSocket::handle_input_missing_data(void)
             if (m_Header.space() > 0)
             {
                 // Couldn't receive the whole header this time.
-                ACE_ASSERT (message_block.length() == 0);
+                ASSERT(message_block.length() == 0);
                 errno = EWOULDBLOCK;
                 return -1;
             }
@@ -570,7 +569,7 @@ int WorldSocket::handle_input_missing_data(void)
             // We just received nice new header
             if (handle_input_header() == -1)
             {
-                ACE_ASSERT ((errno != EWOULDBLOCK) && (errno != EAGAIN));
+                ASSERT((errno != EWOULDBLOCK) && (errno != EAGAIN));
                 return -1;
             }
         }
@@ -596,7 +595,7 @@ int WorldSocket::handle_input_missing_data(void)
             if (m_RecvPct.space() > 0)
             {
                 // Couldn't receive the whole data this time.
-                ACE_ASSERT (message_block.length() == 0);
+                ASSERT(message_block.length() == 0);
                 errno = EWOULDBLOCK;
                 return -1;
             }
@@ -605,7 +604,7 @@ int WorldSocket::handle_input_missing_data(void)
         //just received fresh new payload
         if (handle_input_payload() == -1)
         {
-            ACE_ASSERT ((errno != EWOULDBLOCK) && (errno != EAGAIN));
+            ASSERT((errno != EWOULDBLOCK) && (errno != EAGAIN));
             return -1;
         }
     }
@@ -654,7 +653,7 @@ int WorldSocket::schedule_wakeup_output(GuardType& g)
 
 int WorldSocket::ProcessIncoming(WorldPacket* new_pct)
 {
-    ACE_ASSERT (new_pct);
+    ASSERT(new_pct);
 
     // manage memory ;)
     std::unique_ptr<WorldPacket> aptr (new_pct);
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index 924af7d7b..e5b5859e8 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -141,7 +141,7 @@ protected:
         sLog->outStaticDebug ("Network Thread Starting");
 #endif
 
-        ACE_ASSERT (m_Reactor);
+        ASSERT(m_Reactor);
 
         SocketSet::iterator i, t;
 
@@ -344,7 +344,7 @@ WorldSocketMgr::OnSocketOpen (WorldSocket* sock)
     // we skip the Acceptor Thread
     size_t min = 1;
 
-    ACE_ASSERT (m_NetThreadsCount >= 1);
+    ASSERT(m_NetThreadsCount >= 1);
 
     for (size_t i = 1; i < m_NetThreadsCount; ++i)
         if (m_NetThreads[i].Connections() < m_NetThreads[min].Connections())
diff --git a/src/server/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp
index f55bfece0..d9a5292bb 100644
--- a/src/server/worldserver/RemoteAccess/RASocket.cpp
+++ b/src/server/worldserver/RemoteAccess/RASocket.cpp
@@ -10,8 +10,8 @@
 
 #include "AccountMgr.h"
 #include "Common.h"
-#include "Configuration/Config.h"
-#include "Database/DatabaseEnv.h"
+#include "Config.h"
+#include "DatabaseEnv.h"
 #include "Duration.h"
 #include "Log.h"
 #include "RASocket.h"
@@ -85,7 +85,7 @@ int RASocket::recv_line(ACE_Message_Block& buffer)
             return -1;
         }
 
-        ACE_ASSERT(n == sizeof(byte));
+        ASSERT(n == sizeof(byte));
 
         if (byte == '\n')
             break;