From 03d40c8afe26cbed5b693be36b9dafe3189bf4a5 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Wed, 3 Apr 2024 21:23:30 +0200
Subject: Core/Networking: Fixed Socket::DelayedCloseSocket not working if
 write queue is empty when its called on linux and mac

Closes #29887

(cherry picked from commit f847cd4eeb8ce0d537ef793d8926cf28650724c4)
---
 src/server/game/Server/WorldSocket.cpp | 1 +
 src/server/shared/Networking/Socket.h  | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/server')

diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index d4317cf5e14..7a3a1841853 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -724,6 +724,7 @@ void WorldSocket::HandleAuthSessionCallback(std::shared_ptr<WorldPackets::Auth::
     // Check that Key and account name are the same on client and server
     if (memcmp(hmac.GetDigest().data(), authSession->Digest.data(), authSession->Digest.size()) != 0)
     {
+        SendAuthResponseError(ERROR_DENIED);
         TC_LOG_ERROR("network", "WorldSocket::HandleAuthSession: Authentication failed for account: {} ('{}') address: {}", account.Game.Id, authSession->RealmJoinTicket, address);
         DelayedCloseSocket();
         return;
diff --git a/src/server/shared/Networking/Socket.h b/src/server/shared/Networking/Socket.h
index 511f94ed366..40f5820da92 100644
--- a/src/server/shared/Networking/Socket.h
+++ b/src/server/shared/Networking/Socket.h
@@ -164,7 +164,14 @@ public:
     }
 
     /// Marks the socket for closing after write buffer becomes empty
-    void DelayedCloseSocket() { _closing = true; }
+    void DelayedCloseSocket()
+    {
+        if (_closing.exchange(true))
+            return;
+
+        if (_writeQueue.empty())
+            CloseSocket();
+    }
 
     MessageBuffer& GetReadBuffer() { return _readBuffer; }
 
-- 
cgit v1.2.3