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

Cleanup proto structure

Browse Source 
Removed unused/extraneous enumerants.
This commit is contained in:
Kawe Mazidjatari 2023-08-04 11:20:24 +02:00
parent 10ee88ec10
commit f6d2628937
9 changed files with 42 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,15 +416,7 @@ bool CRConServer::ProcessMessage(const char* pMsgBuf, const int nMsgLen)
{
if (pData.m_bAuthorized) // Only execute if auth was successful.
{
Execute(request, false);
}
break;
}
case cl_rcon::request_t::SERVERDATA_REQUEST_SETVALUE:
{
if (pData.m_bAuthorized)
{
Execute(request, true);
Execute(request);
}
break;
}
@ -432,6 +424,7 @@ bool CRConServer::ProcessMessage(const char* pMsgBuf, const int nMsgLen)
{
if (pData.m_bAuthorized)
{
// !TODO[ AMOS ]: Each netcon its own var???
sv_rcon_sendlogs->SetValue(request.requestval().c_str());
}
break;
@ -448,17 +441,13 @@ bool CRConServer::ProcessMessage(const char* pMsgBuf, const int nMsgLen)
//-----------------------------------------------------------------------------
// Purpose: execute commands issued from netconsole
// Input : *request -
// bConVar -
//-----------------------------------------------------------------------------
void CRConServer::Execute(const cl_rcon::request& request, const bool bConVar) const
void CRConServer::Execute(const cl_rcon::request& request) const
{
if (bConVar)
ConVar* pConVar = g_pCVar->FindVar(request.requestmsg().c_str());
if (pConVar) // Only run if this is a ConVar.
{
ConVar* pConVar = g_pCVar->FindVar(request.requestmsg().c_str());
if (pConVar) // Only run if this is a ConVar.
{
pConVar->SetValue(request.requestval().c_str());
}
pConVar->SetValue(request.requestval().c_str());
}
else // Execute command with "<val>".
{

2
r5dev/engine/server/sv_rcon.h
View File

@ -42,7 +42,7 @@ public:
virtual bool ProcessMessage(const char* pMsgBuf, const int nMsgLen) override;
void Execute(const cl_rcon::request& request, const bool bConVar) const;
void Execute(const cl_rcon::request& request) const;
bool CheckForBan(CConnectedNetConsoleData& pData);
virtual void Disconnect(const char* szReason = nullptr) override;

9
r5dev/netconsole/netconsole.cpp
View File

@ -130,6 +130,7 @@ void CNetCon::UserInput(void)
return;
}
// !TODO[ AMOS ]: Swap out with CCommand!
const vector<string> vSubStrings = StringSplit(m_Input, ' ', 2);
vector<char> vecMsg;
@ -143,14 +144,6 @@ void CNetCon::UserInput(void)
bSend = Serialize(vecMsg, vSubStrings[1].c_str(), "",
cl_rcon::request_t::SERVERDATA_REQUEST_AUTH);
}
else if (vSubStrings[0].compare("SET") == 0) // Set value query.
{
if (vSubStrings.size() > 2)
{
bSend = Serialize(vecMsg, vSubStrings[1].c_str(), vSubStrings[2].c_str(),
cl_rcon::request_t::SERVERDATA_REQUEST_SETVALUE);
}
}
else // Execute command query.
{
bSend = Serialize(vecMsg, m_Input.c_str(), "",

34
r5dev/protoc/cl_rcon.pb.cc
View File

@ -43,41 +43,29 @@ bool request_t_IsValid(int value) {
case 0:
case 1:
case 2:
case 3:
case 4:
case 5:
return true;
default:
return false;
}
}
static ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed<std::string> request_t_strings[6] = {};
static ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed<std::string> request_t_strings[3] = {};
static const char request_t_names[] =
"SERVERDATA_REQUEST_AUTH"
"SERVERDATA_REQUEST_EXECCOMMAND"
"SERVERDATA_REQUEST_SEND_CONSOLE_LOG"
"SERVERDATA_REQUEST_SEND_REMOTEBUG"
"SERVERDATA_REQUEST_SETVALUE"
"SERVERDATA_REQUEST_VALUE";
"SERVERDATA_REQUEST_SEND_CONSOLE_LOG";
static const ::PROTOBUF_NAMESPACE_ID::internal::EnumEntry request_t_entries[] = {
{ {request_t_names + 0, 23}, 3 },
{ {request_t_names + 23, 30}, 2 },
{ {request_t_names + 53, 35}, 4 },
{ {request_t_names + 88, 33}, 5 },
{ {request_t_names + 121, 27}, 1 },
{ {request_t_names + 148, 24}, 0 },
{ {request_t_names + 0, 23}, 1 },
{ {request_t_names + 23, 30}, 0 },
{ {request_t_names + 53, 35}, 2 },
};
static const int request_t_entries_by_number[] = {
5, // 0 -> SERVERDATA_REQUEST_VALUE
4, // 1 -> SERVERDATA_REQUEST_SETVALUE
1, // 2 -> SERVERDATA_REQUEST_EXECCOMMAND
0, // 3 -> SERVERDATA_REQUEST_AUTH
2, // 4 -> SERVERDATA_REQUEST_SEND_CONSOLE_LOG
3, // 5 -> SERVERDATA_REQUEST_SEND_REMOTEBUG
1, // 0 -> SERVERDATA_REQUEST_EXECCOMMAND
0, // 1 -> SERVERDATA_REQUEST_AUTH
2, // 2 -> SERVERDATA_REQUEST_SEND_CONSOLE_LOG
};
const std::string& request_t_Name(
@ -86,12 +74,12 @@ const std::string& request_t_Name(
::PROTOBUF_NAMESPACE_ID::internal::InitializeEnumStrings(
request_t_entries,
request_t_entries_by_number,
6, request_t_strings);
3, request_t_strings);
(void) dummy;
int idx = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumName(
request_t_entries,
request_t_entries_by_number,
6, value);
3, value);
return idx == -1 ? ::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString() :
request_t_strings[idx].get();
}
@ -99,7 +87,7 @@ bool request_t_Parse(
::PROTOBUF_NAMESPACE_ID::ConstStringParam name, request_t* value) {
int int_value;
bool success = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumValue(
request_t_entries, 6, name, &int_value);
request_t_entries, 3, name, &int_value);
if (success) {
*value = static_cast<request_t>(int_value);
}

13
r5dev/protoc/cl_rcon.pb.h
View File

@ -53,18 +53,15 @@ PROTOBUF_NAMESPACE_CLOSE
namespace cl_rcon {
enum request_t : int {
SERVERDATA_REQUEST_VALUE = 0,
SERVERDATA_REQUEST_SETVALUE = 1,
SERVERDATA_REQUEST_EXECCOMMAND = 2,
SERVERDATA_REQUEST_AUTH = 3,
SERVERDATA_REQUEST_SEND_CONSOLE_LOG = 4,
SERVERDATA_REQUEST_SEND_REMOTEBUG = 5,
SERVERDATA_REQUEST_EXECCOMMAND = 0,
SERVERDATA_REQUEST_AUTH = 1,
SERVERDATA_REQUEST_SEND_CONSOLE_LOG = 2,
request_t_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::min(),
request_t_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::max()
};
bool request_t_IsValid(int value);
constexpr request_t request_t_MIN = SERVERDATA_REQUEST_VALUE;
constexpr request_t request_t_MAX = SERVERDATA_REQUEST_SEND_REMOTEBUG;
constexpr request_t request_t_MIN = SERVERDATA_REQUEST_EXECCOMMAND;
constexpr request_t request_t_MAX = SERVERDATA_REQUEST_SEND_CONSOLE_LOG;
constexpr int request_t_ARRAYSIZE = request_t_MAX + 1;
const std::string& request_t_Name(request_t value);

34
r5dev/protoc/sv_rcon.pb.cc
View File

@ -42,42 +42,26 @@ bool response_t_IsValid(int value) {
switch (value) {
case 0:
case 1:
case 2:
case 3:
case 4:
case 5:
return true;
default:
return false;
}
}
static ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed<std::string> response_t_strings[6] = {};
static ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed<std::string> response_t_strings[2] = {};
static const char response_t_names[] =
"SERVERDATA_RESPONSE_AUTH"
"SERVERDATA_RESPONSE_CONSOLE_LOG"
"SERVERDATA_RESPONSE_REMOTEBUG"
"SERVERDATA_RESPONSE_STRING"
"SERVERDATA_RESPONSE_UPDATE"
"SERVERDATA_RESPONSE_VALUE";
"SERVERDATA_RESPONSE_CONSOLE_LOG";
static const ::PROTOBUF_NAMESPACE_ID::internal::EnumEntry response_t_entries[] = {
{ {response_t_names + 0, 24}, 2 },
{ {response_t_names + 24, 31}, 3 },
{ {response_t_names + 55, 29}, 5 },
{ {response_t_names + 84, 26}, 4 },
{ {response_t_names + 110, 26}, 1 },
{ {response_t_names + 136, 25}, 0 },
{ {response_t_names + 0, 24}, 0 },
{ {response_t_names + 24, 31}, 1 },
};
static const int response_t_entries_by_number[] = {
5, // 0 -> SERVERDATA_RESPONSE_VALUE
4, // 1 -> SERVERDATA_RESPONSE_UPDATE
0, // 2 -> SERVERDATA_RESPONSE_AUTH
1, // 3 -> SERVERDATA_RESPONSE_CONSOLE_LOG
3, // 4 -> SERVERDATA_RESPONSE_STRING
2, // 5 -> SERVERDATA_RESPONSE_REMOTEBUG
0, // 0 -> SERVERDATA_RESPONSE_AUTH
1, // 1 -> SERVERDATA_RESPONSE_CONSOLE_LOG
};
const std::string& response_t_Name(
@ -86,12 +70,12 @@ const std::string& response_t_Name(
::PROTOBUF_NAMESPACE_ID::internal::InitializeEnumStrings(
response_t_entries,
response_t_entries_by_number,
6, response_t_strings);
2, response_t_strings);
(void) dummy;
int idx = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumName(
response_t_entries,
response_t_entries_by_number,
6, value);
2, value);
return idx == -1 ? ::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString() :
response_t_strings[idx].get();
}
@ -99,7 +83,7 @@ bool response_t_Parse(
::PROTOBUF_NAMESPACE_ID::ConstStringParam name, response_t* value) {
int int_value;
bool success = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumValue(
response_t_entries, 6, name, &int_value);
response_t_entries, 2, name, &int_value);
if (success) {
*value = static_cast<response_t>(int_value);
}

12
r5dev/protoc/sv_rcon.pb.h
View File

@ -53,18 +53,14 @@ PROTOBUF_NAMESPACE_CLOSE
namespace sv_rcon {
enum response_t : int {
SERVERDATA_RESPONSE_VALUE = 0,
SERVERDATA_RESPONSE_UPDATE = 1,
SERVERDATA_RESPONSE_AUTH = 2,
SERVERDATA_RESPONSE_CONSOLE_LOG = 3,
SERVERDATA_RESPONSE_STRING = 4,
SERVERDATA_RESPONSE_REMOTEBUG = 5,
SERVERDATA_RESPONSE_AUTH = 0,
SERVERDATA_RESPONSE_CONSOLE_LOG = 1,
response_t_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::min(),
response_t_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::max()
};
bool response_t_IsValid(int value);
constexpr response_t response_t_MIN = SERVERDATA_RESPONSE_VALUE;
constexpr response_t response_t_MAX = SERVERDATA_RESPONSE_REMOTEBUG;
constexpr response_t response_t_MIN = SERVERDATA_RESPONSE_AUTH;
constexpr response_t response_t_MAX = SERVERDATA_RESPONSE_CONSOLE_LOG;
constexpr int response_t_ARRAYSIZE = response_t_MAX + 1;
const std::string& response_t_Name(response_t value);

9
r5dev/resource/protobuf/cl_rcon.proto
View File

@ -4,12 +4,9 @@ option optimize_for = LITE_RUNTIME;
enum request_t
{
SERVERDATA_REQUEST_VALUE = 0;
SERVERDATA_REQUEST_SETVALUE = 1;
SERVERDATA_REQUEST_EXECCOMMAND = 2;
SERVERDATA_REQUEST_AUTH = 3;
SERVERDATA_REQUEST_SEND_CONSOLE_LOG = 4;
SERVERDATA_REQUEST_SEND_REMOTEBUG = 5;
SERVERDATA_REQUEST_EXECCOMMAND = 0;
SERVERDATA_REQUEST_AUTH = 1;
SERVERDATA_REQUEST_SEND_CONSOLE_LOG = 2;
}
message request

8
r5dev/resource/protobuf/sv_rcon.proto
View File

@ -4,12 +4,8 @@ option optimize_for = LITE_RUNTIME;
enum response_t
{
SERVERDATA_RESPONSE_VALUE = 0;
SERVERDATA_RESPONSE_UPDATE = 1;
SERVERDATA_RESPONSE_AUTH = 2;
SERVERDATA_RESPONSE_CONSOLE_LOG = 3;
SERVERDATA_RESPONSE_STRING = 4;
SERVERDATA_RESPONSE_REMOTEBUG = 5;
SERVERDATA_RESPONSE_AUTH = 0;
SERVERDATA_RESPONSE_CONSOLE_LOG = 1;
}
message response