R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement client rcon send log request

Browse Source 
If 'cl_rcon_request_sendlogs' is set, the netconsole will request the server to send console logs to the rcon client after successful auth.
This commit is contained in:
Kawe Mazidjatari 2022-08-17 11:50:40 +02:00
parent 39b95a9716
commit 619ac76452
8 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
r5dev/engine/client/cl_rcon.cpp
View File

@ -285,7 +285,19 @@ void CRConClient::ProcessMessage(const sv_rcon::response& sv_response) const
{
case sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH:
{
StringReplace(svOut, sDLL_T[7], "");
if (!sv_response.responseval().empty())
{
long i = strtol(sv_response.responseval().c_str(), NULL, NULL);
if (!i) // sv_rcon_sendlogs is not set.
{
if (cl_rcon_request_sendlogs->GetBool())
{
string svLogQuery = this->Serialize("", "", cl_rcon::request_t::SERVERDATA_REQUEST_SEND_CONSOLE_LOG);
this->Send(svLogQuery);
}
}
}
DevMsg(eDLL_T::NETCON, "%s", svOut.c_str());
break;
}

11
r5dev/engine/server/sv_rcon.cpp
View File

@ -245,7 +245,7 @@ void CRConServer::Recv(void)
{//////////////////////////////////////////////
if (this->CheckForBan(pData))
{
this->Send(pData->m_hSocket, this->Serialize(s_pszBannedMessage, "", sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH));
this->Send(pData->m_hSocket, this->Serialize(s_pszBannedMessage, "", sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, 7/*NETCON_S*/));
this->CloseConnection();
continue;
}
@ -304,12 +304,13 @@ std::string CRConServer::Serialize(const std::string& svRspBuf, const std::strin
case sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH:
{
sv_response.set_responsebuf(svRspBuf);
sv_response.set_responseval(svRspVal);
break;
}
case sv_rcon::response_t::SERVERDATA_RESPONSE_CONSOLE_LOG:
{
sv_response.set_responsebuf(svRspBuf);
sv_response.set_responseval("");
sv_response.set_responseval(svRspVal);
break;
}
default:
@ -352,7 +353,7 @@ void CRConServer::Authenticate(const cl_rcon::request& cl_request, CConnectedNet
m_pSocket->CloseListenSocket();
this->CloseNonAuthConnection();
this->Send(pData->m_hSocket, this->Serialize(s_pszAuthMessage, "", sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH));
this->Send(pData->m_hSocket, this->Serialize(s_pszAuthMessage, sv_rcon_sendlogs->GetString(), sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, 7/*NETCON_S*/));
}
else // Bad password.
{
@ -362,7 +363,7 @@ void CRConServer::Authenticate(const cl_rcon::request& cl_request, CConnectedNet
DevMsg(eDLL_T::SERVER, "Bad RCON password attempt from '%s'\n", netAdr2.GetIPAndPort().c_str());
}
this->Send(pData->m_hSocket, this->Serialize(s_pszWrongPwMessage, "", sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH));
this->Send(pData->m_hSocket, this->Serialize(s_pszWrongPwMessage, "", sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, 7/*NETCON_S*/));
pData->m_bAuthorized = false;
pData->m_bValidated = false;
@ -474,7 +475,7 @@ void CRConServer::ProcessMessage(const cl_rcon::request& cl_request)
&& cl_request.requesttype() != cl_rcon::request_t::SERVERDATA_REQUEST_AUTH)
{
// Notify net console that authentication is required.
this->Send(pData->m_hSocket, this->Serialize(s_pszNoAuthMessage, "", sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH));
this->Send(pData->m_hSocket, this->Serialize(s_pszNoAuthMessage, "", sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH, 7/*NETCON_S*/));
pData->m_bValidated = false;
pData->m_nIgnoredMessage++;

12
r5dev/netconsole/netconsole.cpp
View File

@ -398,6 +398,18 @@ void CNetCon::ProcessMessage(const sv_rcon::response& sv_response) const
switch (sv_response.responsetype())
{
case sv_rcon::response_t::SERVERDATA_RESPONSE_AUTH:
{
if (!sv_response.responseval().empty())
{
long i = strtol(sv_response.responseval().c_str(), NULL, NULL);
if (!i) // sv_rcon_sendlogs is not set.
{
string svLogQuery = this->Serialize("", "", cl_rcon::request_t::SERVERDATA_REQUEST_SEND_CONSOLE_LOG);
this->Send(svLogQuery);
}
}
[[fallthrough]];
}
case sv_rcon::response_t::SERVERDATA_RESPONSE_CONSOLE_LOG:
{
std::string svOut = sv_response.responsebuf();

5
r5dev/tier0/dbg.cpp
View File

@ -105,6 +105,7 @@ void NetMsg(int context, const char* fmt, ...)
static std::shared_ptr<spdlog::logger> ntlogger = spdlog::get("net_con");
switch (context)
{
case -4:
case -3:
case -2:
case -1:
@ -151,7 +152,7 @@ void NetMsg(int context, const char* fmt, ...)
color = ImVec4(0.59f, 0.48f, 0.53f, 1.00f);
break;
default:
color = ImVec4(0.59f, 0.58f, 0.63f, 1.00f);
color = ImVec4(0.59f, 0.59f, 0.59f, 1.00f);
break;
}
}
@ -187,6 +188,8 @@ void NetMsg(int context, const char* fmt, ...)
case 4:
case 5:
case 6:
case 7:
case 8:
{
s_LogMutex.lock();
{/////////////////////////////

2
r5dev/tier0/dbg.h
View File

@ -23,7 +23,7 @@ enum class eDLL_T : int
RTECH = 5, // RTech API
MS = 6, // Material System
NETCON = 7, // Net Console
COMMON = 8
COMMON = 8
};
const string sDLL_T[9] =

2
r5dev/tier1/IConVar.cpp
View File

@ -117,6 +117,8 @@ void ConVar::Init(void) const
//-------------------------------------------------------------------------
// CLIENT |
#ifndef DEDICATED
cl_rcon_request_sendlogs = ConVar::Create("cl_rcon_request_sendlogs", "1" , FCVAR_RELEASE, "Request the rcon server to send console logs on connect.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_drawconsoleoverlay = ConVar::Create("cl_drawconsoleoverlay" , "0" , FCVAR_DEVELOPMENTONLY, "Draws the RUI console overlay at the top of the screen.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_consoleoverlay_lines = ConVar::Create("cl_consoleoverlay_lines" , "3" , FCVAR_DEVELOPMENTONLY, "Number of lines of console output to draw.", false, 0.f, false, 0.f, nullptr, nullptr);
cl_consoleoverlay_invert_rect_x = ConVar::Create("cl_consoleoverlay_invert_rect_x", "0" , FCVAR_DEVELOPMENTONLY, "Inverts the X rect for RUI console overlay.", false, 0.f, false, 0.f, nullptr, nullptr);

2
r5dev/tier1/cvar.cpp
View File

@ -83,6 +83,8 @@ ConVar* bhit_abs_origin = nullptr;
//-----------------------------------------------------------------------------
// CLIENT |
#ifndef DEDICATED
ConVar* cl_rcon_request_sendlogs = nullptr;
ConVar* cl_drawconsoleoverlay = nullptr;
ConVar* cl_consoleoverlay_lines = nullptr;
ConVar* cl_consoleoverlay_invert_rect_x = nullptr;

2
r5dev/tier1/cvar.h
View File

@ -78,6 +78,8 @@ extern ConVar* bhit_abs_origin;
//-------------------------------------------------------------------------
// CLIENT |
#ifndef DEDICATED
extern ConVar* cl_rcon_request_sendlogs;
extern ConVar* cl_drawconsoleoverlay;
extern ConVar* cl_consoleoverlay_lines;
extern ConVar* cl_consoleoverlay_invert_rect_x;