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

Small improvements

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-04-24 19:32:47 +02:00
parent 31b95f41e8
commit 82261f6c56
5 changed files with 68 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/engine/host_state.cpp
View File

@ -244,7 +244,7 @@ FORCEINLINE void CHostState::Think(void) const
string svCurrentPlaylist = KeyValues_GetCurrentPlaylist();
int32_t nPlayerCount = g_pServer->GetNumHumanPlayers();
SetConsoleTitleA(fmt::format("{} - {}/{} Players ({} on {})",
SetConsoleTitleA(fmt::format("{:s} - {:d}/{:d} Players ({:s} on {:s})",
hostname->GetString(), nPlayerCount, g_ServerGlobalVariables->m_nMaxClients, svCurrentPlaylist.c_str(), m_levelName).c_str());
statsTimer.Start();
}

69
r5dev/engine/net.cpp
View File

@ -20,41 +20,40 @@
#endif // !NETCONSOLE
#ifndef NETCONSOLE
//-----------------------------------------------------------------------------
// Purpose: shutdown netchannel
//-----------------------------------------------------------------------------
void NET_ShutDown(void* thisptr, const char* szReason, std::uint8_t a1, char a2)
{
#if !defined (GAMEDLL_S0) || !defined (GAMEDLL_S1) // !TEMP UNTIL CHOSTSTATE IS BUILD AGNOSTIC! //
_DownloadPlaylists_f_CompletionFunc(); // Re-load playlist from disk after getting disconnected from the server.
#endif // !GAMEDLL_S0 || !GAMEDLL_S1
v_NET_Shutdown(thisptr, szReason, a1, a2);
}
//-----------------------------------------------------------------------------
// Purpose: hook and log the receive datagram
// Input : iSocket -
// *pInpacket -
// bEncrypted -
// Output : true on success, false otherwise
//-----------------------------------------------------------------------------
bool NET_ReceiveDatagram(int iSocket, netpacket_s* pInpacket, bool bRaw)
bool NET_ReceiveDatagram(int iSocket, netpacket_s* pInpacket, bool bEncrypted)
{
bool result = v_NET_ReceiveDatagram(iSocket, pInpacket, bRaw);
bool result = v_NET_ReceiveDatagram(iSocket, pInpacket, bEncrypted);
if (result)
{
// Log received packet data.
HexDump("[+] NET_ReceiveDatagram", 0, &pInpacket->data[NULL], pInpacket->wiresize);
HexDump("[+] NET_ReceiveDatagram", "netchan_packet_logger", &pInpacket->data[NULL], pInpacket->wiresize);
}
return result;
}
//-----------------------------------------------------------------------------
// Purpose: hook and log the send datagram
// Input : s -
// *pPayload -
// iLenght -
// *pAdr -
// bEncrypted -
// Output : outgoing sequence number for this packet
//-----------------------------------------------------------------------------
void* NET_SendDatagram(SOCKET s, const char* szPayload, int iLenght, int nFlags)
int NET_SendDatagram(SOCKET s, void* pPayload, int iLenght, v_netadr_t* pAdr, bool bEncrypted)
{
void* result = v_NET_SendDatagram(s, szPayload, iLenght, nFlags);
int result = v_NET_SendDatagram(s, pPayload, iLenght, pAdr, bEncrypted);
if (result)
{
// Log transmitted packet data.
HexDump("[+] NET_SendDatagram", 0, szPayload, iLenght);
HexDump("[+] NET_SendDatagram", "netchan_packet_logger", pPayload, iLenght);
}
return result;
}
@ -114,6 +113,8 @@ void NET_GenerateKey()
//-----------------------------------------------------------------------------
// Purpose: hook and log the client's signonstate to the console
// Input : *fmt -
// ... -
//-----------------------------------------------------------------------------
void NET_PrintFunc(const char* fmt, ...)
{
@ -131,9 +132,27 @@ void NET_PrintFunc(const char* fmt, ...)
}
//-----------------------------------------------------------------------------
// Purpose: disconnect the client and shutdown netchannel
// Purpose: shutdown netchannel
// Input : *this -
// *szReason -
// a3 -
// bRemoveNow -
//-----------------------------------------------------------------------------
void NET_DisconnectClient(CBaseClient* pClient, int nIndex, const char* szReason, uint8_t unk1, char unk2)
void NET_Shutdown(void* thisptr, const char* szReason, uint8_t a1, bool bRemoveNow)
{
_DownloadPlaylists_f_CompletionFunc(); // Re-load playlist from disk after getting disconnected from the server.
v_NET_Shutdown(thisptr, szReason, a1, bRemoveNow);
}
//-----------------------------------------------------------------------------
// Purpose: disconnect the client and shutdown netchannel
// Input : *pClient -
// nIndex -
// *szReason -
// unk1 -
// unk2 -
//-----------------------------------------------------------------------------
void NET_DisconnectClient(CBaseClient* pClient, int nIndex, const char* szReason, uint8_t unk1, bool bRemoveNow)
{
#ifndef CLIENT_DLL
if (!pClient || std::strlen(szReason) == NULL || !pClient->GetNetChan())
@ -141,10 +160,10 @@ void NET_DisconnectClient(CBaseClient* pClient, int nIndex, const char* szReason
return;
}
v_NET_Shutdown(pClient->GetNetChan(), szReason, unk1, unk2); // Shutdown netchan.
pClient->SetNetChan(nullptr); // Null netchan.
CBaseClient_Clear(pClient); // Reset CClient instance for client.
g_bIsPersistenceVarSet[nIndex] = false; // Reset Persistence var.
v_NET_Shutdown(pClient->GetNetChan(), szReason, unk1, bRemoveNow); // Shutdown netchan.
pClient->SetNetChan(nullptr); // Null netchan.
CBaseClient_Clear(pClient); // Reset CClient instance for client.
g_bIsPersistenceVarSet[nIndex] = false; // Reset Persistence var.
#endif // !CLIENT_DLL
}
#endif // !NETCONSOLE
@ -211,7 +230,7 @@ void NET_Attach()
{
DetourAttach((LPVOID*)&v_NET_PrintFunc, &NET_PrintFunc);
#ifndef DEDICATED
DetourAttach((LPVOID*)&v_NET_Shutdown, &NET_ShutDown);
DetourAttach((LPVOID*)&v_NET_Shutdown, &NET_Shutdown);
#endif
}
@ -219,7 +238,7 @@ void NET_Detach()
{
DetourDetach((LPVOID*)&v_NET_PrintFunc, &NET_PrintFunc);
#ifndef DEDICATED
DetourDetach((LPVOID*)&v_NET_Shutdown, &NET_ShutDown);
DetourDetach((LPVOID*)&v_NET_Shutdown, &NET_Shutdown);
#endif
}

21
r5dev/engine/net.h
View File

@ -11,7 +11,7 @@ inline CMemory p_NET_Init;
inline auto v_NET_Init = p_NET_Init.RCast<void* (*)(char a1)>();
inline CMemory p_NET_Shutdown;
inline auto v_NET_Shutdown = p_NET_Shutdown.RCast<void (*)(void* thisptr, const char* szReason, uint8_t a3, char a4)>();
inline auto v_NET_Shutdown = p_NET_Shutdown.RCast<void (*)(void* thisptr, const char* szReason, uint8_t a3, bool bRemoveNow)>();
inline CMemory p_NET_SetKey;
inline auto v_NET_SetKey = p_NET_SetKey.RCast<void (*)(uintptr_t pKey, const char* szHash)>();
@ -20,18 +20,19 @@ inline CMemory p_NET_ReceiveDatagram;
inline auto v_NET_ReceiveDatagram = p_NET_ReceiveDatagram.RCast<bool (*)(int iSocket, netpacket_s* pInpacket, bool bRaw)>();
inline CMemory p_NET_SendDatagram;
inline auto v_NET_SendDatagram = p_NET_SendDatagram.RCast<void* (*)(SOCKET s, const char* szPayload, int iLenght, int nFlags)>();
inline auto v_NET_SendDatagram = p_NET_SendDatagram.RCast<int (*)(SOCKET s, void* pPayload, int iLenght, v_netadr_t* pAdr, bool bEncrypted)>();
inline CMemory p_NET_PrintFunc;
inline auto v_NET_PrintFunc = p_NET_PrintFunc.RCast<void(*)(const char* fmt)>();
///////////////////////////////////////////////////////////////////////////////
bool NET_ReceiveDatagram(int iSocket, netpacket_s* pInpacket, bool bRaw);
void* NET_SendDatagram(SOCKET s, const char* szPayload, int iLenght, int nFlags);
int NET_SendDatagram(SOCKET s, void* pPayload, int iLenght, v_netadr_t* pAdr, bool bEncrypted);
void NET_SetKey(const string& svNetKey);
void NET_GenerateKey();
void NET_PrintFunc(const char* fmt, ...);
void NET_DisconnectClient(CBaseClient* pClient, int nIndex, const char* szReason, uint8_t unk1, char unk2);
void NET_Shutdown(void* thisptr, const char* szReason, uint8_t a1, bool bRemoveNow);
void NET_DisconnectClient(CBaseClient* pClient, int nIndex, const char* szReason, uint8_t unk1, bool bRemoveNow);
void NET_Attach();
void NET_Detach();
@ -70,12 +71,12 @@ class HNetChan : public IDetour
p_NET_SendDatagram = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x08\x48\x89\x6C\x24\x10\x48\x89\x74\x24\x18\x57\x41\x56\x41\x57\x48\x81\xEC\x00\x05\x00\x00"), "xxxxxxxxxxxxxxxxxxxxxxx?xxx");
p_NET_PrintFunc = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x54\x24\x10\x4C\x89\x44\x24\x18\x4C\x89\x4C\x24\x20\xC3\x48"), "xxxxxxxxxxxxxxxxx");
v_NET_Init = p_NET_Init.RCast<void* (*)(char)>(); /*48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 48 89 7C 24 20 41 54 41 56 41 57 48 81 EC F0 01 00*/
v_NET_Shutdown = p_NET_Shutdown.RCast<void (*)(void*, const char*, uint8_t, char)>(); /*48 89 6C 24 18 56 57 41 56 48 83 EC 30 83 B9 D0*/
v_NET_SetKey = p_NET_SetKey.RCast<void (*)(uintptr_t, const char*)>(); /*48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 48 83 EC 20 48 8B F9 41 B8*/
v_NET_ReceiveDatagram = p_NET_ReceiveDatagram.RCast<bool (*)(int, netpacket_s*, bool)>(); /*E8 ?? ?? ?? ?? 84 C0 75 35 48 8B D3*/
v_NET_SendDatagram = p_NET_SendDatagram.RCast<void* (*)(SOCKET, const char*, int, int)>(); /*48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 41 56 41 57 48 81 EC ?? 05 00 00*/
v_NET_PrintFunc = p_NET_PrintFunc.RCast<void(*)(const char*)>(); /*48 89 54 24 10 4C 89 44 24 18 4C 89 4C 24 20 C3 48*/
v_NET_Init = p_NET_Init.RCast<void* (*)(char)>(); /*48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 48 89 7C 24 20 41 54 41 56 41 57 48 81 EC F0 01 00*/
v_NET_Shutdown = p_NET_Shutdown.RCast<void (*)(void*, const char*, uint8_t, bool)>(); /*48 89 6C 24 18 56 57 41 56 48 83 EC 30 83 B9 D0*/
v_NET_SetKey = p_NET_SetKey.RCast<void (*)(uintptr_t, const char*)>(); /*48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 48 83 EC 20 48 8B F9 41 B8*/
v_NET_ReceiveDatagram = p_NET_ReceiveDatagram.RCast<bool (*)(int, netpacket_s*, bool)>(); /*E8 ?? ?? ?? ?? 84 C0 75 35 48 8B D3*/
v_NET_SendDatagram = p_NET_SendDatagram.RCast<int (*)(SOCKET, void*, int, v_netadr_t*, bool)>(); /*48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 41 56 41 57 48 81 EC ?? 05 00 00*/
v_NET_PrintFunc = p_NET_PrintFunc.RCast<void(*)(const char*)>(); /*48 89 54 24 10 4C 89 44 24 18 4C 89 4C 24 20 C3 48*/
}
virtual void GetVar(void) const

2
r5dev/public/include/utility.h
View File

@ -12,7 +12,7 @@ DWORD64 FindPatternSIMD(const char* szModule, const unsigned char* szPattern, co
// Utility
void DbgPrint(LPCSTR sFormat, ...);
void PrintLastError(void);
void HexDump(const char* szHeader, int nFunc, const void* pData, int nSize);
void HexDump(const char* szHeader, const char* szLogger, const void* pData, int nSize);
string CreateDirectories(string svFilePath);
string ConvertToWinPath(const string& svInput);

15
r5dev/public/utility.cpp
View File

@ -159,7 +159,7 @@ void PrintLastError(void)
///////////////////////////////////////////////////////////////////////////////
// For dumping data from a buffer to a file on the disk
void HexDump(const char* szHeader, int nFunc, const void* pData, int nSize)
void HexDump(const char* szHeader, const char* szLogger, const void* pData, int nSize)
{
static unsigned char szAscii[17] = {};
static std::atomic<int> i = {}, j = {}, k = {};
@ -171,8 +171,15 @@ void HexDump(const char* szHeader, int nFunc, const void* pData, int nSize)
k = 1;
szAscii[16] = '\0';
// Add new loggers here to replace the placeholder.
if (nFunc == 0) { logger = spdlog::get("netchan_packet_logger"); }
if (szLogger)
{
logger = spdlog::get(szLogger);
if (!logger)
{
assert(logger == nullptr);
return;
}
}
// Add timestamp.
logger->set_level(spdlog::level::trace);
@ -181,7 +188,7 @@ void HexDump(const char* szHeader, int nFunc, const void* pData, int nSize)
// Disable EOL and create block header.
logger->set_pattern("%v");
logger->trace("{:s} ---- LEN BYTES: {}\n:\n", szHeader, nSize);
logger->trace("{:s} ---- LEN BYTES: {:d}\n:\n", szHeader, nSize);
logger->trace("-------- 0 1 2 3 4 5 6 7 8 9 A B C D E F 0123456789ABCDEF\n");
// Output the buffer to the file.