From f5fcf8bd7a1f50b2fccc7be600a2710ea62a6c85 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Mon, 1 Apr 2024 01:04:27 +0200 Subject: [PATCH] Engine: rcon code readability improvement Remove the else statement since it will always be else there. --- src/engine/server/sv_rcon.cpp | 51 +++++++++++++++++------------------ 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/src/engine/server/sv_rcon.cpp b/src/engine/server/sv_rcon.cpp index 3a9ccb8d..b1acbf3d 100644 --- a/src/engine/server/sv_rcon.cpp +++ b/src/engine/server/sv_rcon.cpp @@ -382,37 +382,36 @@ void CRConServer::Authenticate(const cl_rcon::request& request, CConnectedNetCon { return; } - else // Authorize. + + // Authorize. + if (Comparator(request.requestmsg())) { - if (Comparator(request.requestmsg())) + data.m_bAuthorized = true; + if (++m_nAuthConnections >= sv_rcon_maxconnections.GetInt()) { - data.m_bAuthorized = true; - if (++m_nAuthConnections >= sv_rcon_maxconnections.GetInt()) - { - m_Socket.CloseListenSocket(); - CloseNonAuthConnection(); - } - - const char* pSendLogs = (!sv_rcon_sendlogs.GetBool() || data.m_bInputOnly) ? "0" : "1"; - - SendEncode(data.m_hSocket, s_AuthMessage, pSendLogs, - sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, static_cast(eDLL_T::NETCON)); + m_Socket.CloseListenSocket(); + CloseNonAuthConnection(); } - else // Bad password. + + const char* pSendLogs = (!sv_rcon_sendlogs.GetBool() || data.m_bInputOnly) ? "0" : "1"; + + SendEncode(data.m_hSocket, s_AuthMessage, pSendLogs, + sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, static_cast(eDLL_T::NETCON)); + } + else // Bad password. + { + const netadr_t& netAdr = m_Socket.GetAcceptedSocketAddress(m_nConnIndex); + if (sv_rcon_debug.GetBool()) { - const netadr_t& netAdr = m_Socket.GetAcceptedSocketAddress(m_nConnIndex); - if (sv_rcon_debug.GetBool()) - { - Msg(eDLL_T::SERVER, "Bad RCON password attempt from '%s'\n", netAdr.ToString()); - } - - SendEncode(data.m_hSocket, s_WrongPwMessage, "", - sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, static_cast(eDLL_T::NETCON)); - - data.m_bAuthorized = false; - data.m_bValidated = false; - data.m_nFailedAttempts++; + Msg(eDLL_T::SERVER, "Bad RCON password attempt from '%s'\n", netAdr.ToString()); } + + SendEncode(data.m_hSocket, s_WrongPwMessage, "", + sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, static_cast(eDLL_T::NETCON)); + + data.m_bAuthorized = false; + data.m_bValidated = false; + data.m_nFailedAttempts++; } }