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 'user_creds_s'

Browse Source 
Light cleanup.
This commit is contained in:
Kawe Mazidjatari 2023-04-01 01:51:39 +02:00
parent e3429705eb
commit b15d848c66
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
r5dev/engine/server/server.cpp
View File

@ -85,20 +85,20 @@ int CServer::GetNumClients(void) const
//---------------------------------------------------------------------------------
bool CServer::AuthClient(user_creds_s* pChallenge)
{
char* pUserID = pChallenge->m_pUserID;
uint64_t nNucleusID = pChallenge->m_nNucleusID;
char* pszPersonaName = pChallenge->personaName;
uint64_t nNucleusID = pChallenge->personaId;
char pszAddresBuffer[INET6_ADDRSTRLEN]; // Render the client's address.
pChallenge->m_nAddr.ToString(pszAddresBuffer, sizeof(pszAddresBuffer));
pChallenge->netAdr.ToString(pszAddresBuffer, sizeof(pszAddresBuffer));
const bool bEnableLogging = sv_showconnecting->GetBool();
if (bEnableLogging)
DevMsg(eDLL_T::SERVER, "Processing connectionless challenge for '%s' ('%llu')\n", pszAddresBuffer, nNucleusID);
// Only proceed connection if the client's name is valid and UTF-8 encoded.
if (!pUserID || !pUserID[0] || !IsValidUTF8(pUserID) || !IsValidPersonaName(pUserID))
if (!VALID_CHARSTAR(pszPersonaName) || !IsValidUTF8(pszPersonaName) || !IsValidPersonaName(pszPersonaName))
{
RejectConnection(m_Socket, &pChallenge->m_nAddr, "#Valve_Reject_Invalid_Name");
RejectConnection(m_Socket, &pChallenge->netAdr, "#Valve_Reject_Invalid_Name");
if (bEnableLogging)
Warning(eDLL_T::SERVER, "Connection rejected for '%s' ('%llu' has an invalid name!)\n", pszAddresBuffer, nNucleusID);
@ -109,7 +109,7 @@ bool CServer::AuthClient(user_creds_s* pChallenge)
{
if (g_pBanSystem->IsBanned(pszAddresBuffer, nNucleusID))
{
RejectConnection(m_Socket, &pChallenge->m_nAddr, "#Valve_Reject_Banned");
RejectConnection(m_Socket, &pChallenge->netAdr, "#Valve_Reject_Banned");
if (bEnableLogging)
Warning(eDLL_T::SERVER, "Connection rejected for '%s' ('%llu' is banned from this server!)\n", pszAddresBuffer, nNucleusID);

12
r5dev/engine/server/server.h
View File

@ -18,12 +18,12 @@ enum class server_state_t
struct user_creds_s
{
netadr_t m_nAddr;
int32_t m_nProtocolVer;
int32_t m_nChallenge;
uint32_t m_nReservation;
uint64_t m_nNucleusID;
char* m_pUserID;
netadr_t netAdr;
int32_t protocolVer;
int32_t challenge;
uint32_t reservation;
uint64_t personaId;
char* personaName;
};
class CServer : public IConnectionlessPacketHandler