Core/Network: Fix some possible exceptions on socket.close()

Ref #12634

2 files changed, 13 insertions, 4 deletions

diff --git a/src/server/authserver/Server/AuthSession.cpp b/src/server/authserver/Server/AuthSession.cpp
index 9bd9313059a..cad82a80a07 100644
--- a/src/server/authserver/Server/AuthSession.cpp
+++ b/src/server/authserver/Server/AuthSession.cpp
@@ -161,7 +161,7 @@ void AuthSession::AsyncReadHeader()
         }
         else
         {
-            _socket.close();
+            CloseSocket();
         }
     });
 }
@@ -176,7 +176,7 @@ void AuthSession::AsyncReadData(bool (AuthSession::*handler)(), size_t dataSize,
         {
             if (!(*this.*handler)())
             {
-                _socket.close();
+                CloseSocket();
                 return;
             }
 
@@ -184,7 +184,7 @@ void AuthSession::AsyncReadData(bool (AuthSession::*handler)(), size_t dataSize,
         }
         else
         {
-            _socket.close();
+            CloseSocket();
         }
     });
 }
@@ -195,7 +195,7 @@ void AuthSession::AsyncWrite(std::size_t length)
     {
         if (error)
         {
-            _socket.close();
+            CloseSocket();
         }
     });
 }
@@ -935,3 +935,11 @@ void AuthSession::SetVSFields(const std::string& rI)
     OPENSSL_free(v_hex);
     OPENSSL_free(s_hex);
 }
+
+void AuthSession::CloseSocket()
+{
+    boost::system::error_code socketError;
+    _socket.close(socketError);
+    if (socketError)
+        TC_LOG_DEBUG("server.authserver", "Account '%s' errored when closing socket: %i (%s)", _login.c_str(), socketError.value(), socketError.message());
+}
diff --git a/src/server/authserver/Server/AuthSession.h b/src/server/authserver/Server/AuthSession.h
index 4ae33f44cb3..6dc9c404857 100644
--- a/src/server/authserver/Server/AuthSession.h
+++ b/src/server/authserver/Server/AuthSession.h
@@ -58,6 +58,7 @@ private:
     void AsyncReadData(bool (AuthSession::*handler)(), size_t dataSize, size_t bufferOffset);
     void AsyncWrite(size_t length);
 
+    void CloseSocket();
 
     void SetVSFields(const std::string& rI);