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

CBitBuf improvements

Browse Source 
* Use proper types reflecting assembly from the engine in 'CBitRead::Seek' (some values are 64bit, either changed by Respawn or the compiler used by Respawn).
* Confirmed changes made to NETMSG_TYPE_BITS (now 511 instead of 255) and NETMSG_LENGTH_BITS (now 12 which is 511 max instead of 255).
* Confirmed msg HUD types.
* Enforce NET_MIN_MESSAGE on 'SVC_UserMessage::Process'.
* Remove unnecessary padding and add proper symbols where padding was actually used.
This commit is contained in:
Kawe Mazidjatari 2022-08-15 02:59:41 +02:00
parent 4056fd7143
commit e6f45aaa9b
5 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
r5dev/common/netmessages.cpp
View File

@ -9,6 +9,7 @@
//
///////////////////////////////////////////////////////////////////////////////////
#include "core/stdafx.h"
#include "engine/net.h"
#include "common/netmessages.h"
bool SVC_Print::Process()
@ -24,13 +25,14 @@ bool SVC_Print::Process()
bool SVC_UserMessage::Process()
{
bf_read buf = m_DataIn;
UserMessages type = (UserMessages)buf.ReadByte();
int type = buf.ReadByte();
if (type == UserMessages::TextMsg)
if (type == HUD_PRINTCONSOLE ||
type == HUD_PRINTCENTER)
{
char text[256];
char text[MAX_USER_MSG_DATA];
buf.ReadString(text, sizeof(text));
if (strnlen_s(text, sizeof(text)) > 0)
if (strnlen_s(text, sizeof(text)) >= NET_MIN_MESSAGE)
{
DevMsg(eDLL_T::SERVER, text);
}

11
r5dev/common/netmessages.h
View File

@ -2,10 +2,10 @@
#include "tier1/bitbuf.h"
#include "public/inetmsghandler.h"
enum class UserMessages : int
{
TextMsg = 0x2
};
#define HUD_PRINTNOTIFY 1
#define HUD_PRINTCONSOLE 2
#define HUD_PRINTTALK 3
#define HUD_PRINTCENTER 4
class INetMessage
{
@ -17,7 +17,6 @@ class CNetMessage : public INetMessage
public:
int m_nGroup;
bool m_bReliable;
char padding[3];
void* m_NetChannel;
};
@ -26,7 +25,7 @@ class SVC_Print : public CNetMessage, IServerMessageHandler
public:
bool Process();
char padding[8];
const void* m_pData;
const char* m_szText;
private:
char m_szTextBuffer[2048];

7
r5dev/engine/net.h
View File

@ -6,6 +6,13 @@
#define FRAGMENT_BITS 8
#define FRAGMENT_SIZE (1<<FRAGMENT_BITS)
// user message
#define MAX_USER_MSG_DATA 511 // <-- 255 in Valve Source.
#define NETMSG_TYPE_BITS 8 // must be 2^NETMSG_TYPE_BITS > SVC_LASTMSG (6 in Valve Source).
#define NETMSG_LENGTH_BITS 12 // 512 bytes (11 in Valve Source, 256 bytes).
#define NET_MIN_MESSAGE 5 // Even connectionless packets require int32 value (-1) + 1 byte content
/* ==== CNETCHAN ======================================================================================================================================================== */
inline CMemory p_NET_Init;
inline auto v_NET_Init = p_NET_Init.RCast<void* (*)(bool bDeveloper)>();

10
r5dev/tier1/bitbuf.cpp
View File

@ -189,7 +189,7 @@ bool CBitRead::ReadString(char* pStr, int maxLen, bool bLine, int* pOutNumChars)
return !IsOverflowed() && !bTooSmall;
}
bool CBitRead::Seek(int nPosition)
bool CBitRead::Seek(size_t nPosition)
{
bool bSucc = true;
if (nPosition < 0 || nPosition > m_nDataBits)
@ -198,10 +198,10 @@ bool CBitRead::Seek(int nPosition)
bSucc = false;
nPosition = m_nDataBits;
}
int nHead = m_nDataBytes & 3; // non-multiple-of-4 bytes at head of buffer. We put the "round off"
size_t nHead = m_nDataBytes & 3; // non-multiple-of-4 bytes at head of buffer. We put the "round off"
// at the head to make reading and detecting the end efficient.
int nByteOfs = nPosition / 8;
size_t nByteOfs = nPosition / 8;
if ((m_nDataBytes < 4) || (nHead && (nByteOfs < nHead)))
{
// partial first dword
@ -220,7 +220,7 @@ bool CBitRead::Seek(int nPosition)
}
else
{
int nAdjPosition = nPosition - (nHead << 3);
ssize_t nAdjPosition = nPosition - (nHead << 3);
m_pDataIn = reinterpret_cast<uint32 const*> (
reinterpret_cast<uint8 const*>(m_pData) + ((nAdjPosition / 32) << 2) + nHead);
if (m_pData)
@ -239,7 +239,7 @@ bool CBitRead::Seek(int nPosition)
return bSucc;
}
void CBitRead::StartReading(const void* pData, int nBytes, int iStartBit, int nBits)
void CBitRead::StartReading(const void* pData, size_t nBytes, size_t iStartBit, size_t nBits)
{
// Make sure it's dword aligned and padded.
assert(((unsigned long)pData & 3) == 0);

8
r5dev/tier1/bitbuf.h
View File

@ -14,7 +14,6 @@ typedef enum
//-----------------------------------------------------------------------------
// Used for serialization
//-----------------------------------------------------------------------------
#pragma pack(push,1)
class CBitBuffer
{
public:
@ -27,11 +26,9 @@ public:
////////////////////////////////////
const char* m_pDebugName;
uint8_t m_bOverflow;
char gap_0x11[7];
size_t m_nDataBits;
size_t m_nDataBytes;
};
#pragma pack(pop)
class CBitRead : public CBitBuffer
{
@ -46,9 +43,8 @@ public:
int ReadChar();
bool ReadString(char* pStr, int bufLen, bool bLine = false, int* pOutNumChars = nullptr);
void StartReading(const void* pData, int nBytes, int iStartBit = 0, int nBits = -1);
bool Seek(int nPosition);
void StartReading(const void* pData, size_t nBytes, size_t iStartBit = 0, size_t nBits = -1);
bool Seek(size_t nPosition);
////////////////////////////////////
uint32_t m_nInBufWord;