Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[Network]: Better reverse of print OOB handler (#1011)

Browse Source
This commit is contained in:
Edo 2023-05-05 19:14:53 +01:00 committed by GitHub
parent 00bc10ac3c
commit 6001044ae6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -45,6 +45,10 @@ The format is based on [Keep a Changelog v0.3.0](http://keepachangelog.com/en/0.
- Chat system will go back to using `SV_CMD_CAN_IGNORE` commands (#972) - Chat system will go back to using `SV_CMD_CAN_IGNORE` commands (#972)
### Security
- Check the address of the sender for the `print` OOB packet (#969)
### Fixed ### Fixed
- Fix bug with how `sv_mapRotationCurrent` is parsed (#977) - Fix bug with how `sv_mapRotationCurrent` is parsed (#977)

8
src/Components/Modules/Gamepad.cpp
View File

@ -1235,11 +1235,11 @@ namespace Components
if (Game::Key_IsCatcherActive(localClientNum, Game::KEYCATCH_LOCATION_SELECTION) && pressedOrUpdated) if (Game::Key_IsCatcherActive(localClientNum, Game::KEYCATCH_LOCATION_SELECTION) && pressedOrUpdated)
{ {
if (key == Game::K_BUTTON_B || keyState.keys[key].binding && strcmp(keyState.keys[key].binding, "+actionslot 4") == 0) if (key == Game::K_BUTTON_B || keyState.keys[key].binding && std::strcmp(keyState.keys[key].binding, "+actionslot 4") == 0)
{ {
keyState.locSelInputState = Game::LOC_SEL_INPUT_CANCEL; keyState.locSelInputState = Game::LOC_SEL_INPUT_CANCEL;
} }
else if (key == Game::K_BUTTON_A || keyState.keys[key].binding && strcmp(keyState.keys[key].binding, "+attack") == 0) else if (key == Game::K_BUTTON_A || keyState.keys[key].binding && std::strcmp(keyState.keys[key].binding, "+attack") == 0)
{ {
keyState.locSelInputState = Game::LOC_SEL_INPUT_CONFIRM; keyState.locSelInputState = Game::LOC_SEL_INPUT_CONFIRM;
} }
@ -1926,7 +1926,7 @@ namespace Components
continue; continue;
} }
if (Game::playerKeys[0].keys[keyNum].binding && strcmp(Game::playerKeys[0].keys[keyNum].binding, gamePadCmd) == 0) if (Game::playerKeys[0].keys[keyNum].binding && std::strcmp(Game::playerKeys[0].keys[keyNum].binding, gamePadCmd) == 0)
{ {
(*keys)[keyCount++] = keyNum; (*keys)[keyCount++] = keyNum;
@ -1946,7 +1946,7 @@ namespace Components
continue; continue;
} }
if (Game::playerKeys[0].keys[keyNum].binding && strcmp(Game::playerKeys[0].keys[keyNum].binding, cmd) == 0) if (Game::playerKeys[0].keys[keyNum].binding && std::strcmp(Game::playerKeys[0].keys[keyNum].binding, cmd) == 0)
{ {
(*keys)[keyCount++] = keyNum; (*keys)[keyCount++] = keyNum;

13
src/Components/Modules/Network.cpp
View File

@ -408,19 +408,20 @@ namespace Components
SendRaw(address, address.getString()); SendRaw(address, address.getString());
}); });
OnClientPacket("print", []([[maybe_unused]] const Address& address, [[maybe_unused]] const std::string& data) OnClientPacketRaw("print", [](Game::netadr_t* address, Game::msg_t* msg)
{ {
auto* clc = Game::CL_GetLocalClientConnection(0); auto* clc = Game::CL_GetLocalClientConnection(0);
if (!Game::NET_CompareBaseAdr(clc->serverAddress, *address.get())) if (!Game::NET_CompareBaseAdr(clc->serverAddress, *address))
{ {
return; return;
} }
char buffer[2048]{}; char printBuf[2048]{};
Game::I_strncpyz(clc->serverMessage, data.data(), sizeof(clc->serverMessage)); const auto* s = Game::MSG_ReadBigString(msg);
Game::Com_sprintf(buffer, sizeof(buffer), "%s", data.data()); Game::I_strncpyz(clc->serverMessage, s, sizeof(clc->serverMessage));
Game::Com_PrintMessage(Game::CON_CHANNEL_CLIENT, buffer, 0); Game::Com_sprintf(printBuf, sizeof(printBuf), "%s", s);
Game::Com_PrintMessage(Game::CON_CHANNEL_CLIENT, printBuf, false);
}); });
} }
} }

2
src/Game/Functions.cpp
View File

@ -93,7 +93,7 @@ namespace Game
MSG_ReadLong_t MSG_ReadLong = MSG_ReadLong_t(0x4C9550); MSG_ReadLong_t MSG_ReadLong = MSG_ReadLong_t(0x4C9550);
MSG_ReadShort_t MSG_ReadShort = MSG_ReadShort_t(0x40BDD0); MSG_ReadShort_t MSG_ReadShort = MSG_ReadShort_t(0x40BDD0);
MSG_ReadInt64_t MSG_ReadInt64 = MSG_ReadInt64_t(0x4F1850); MSG_ReadInt64_t MSG_ReadInt64 = MSG_ReadInt64_t(0x4F1850);
MSG_ReadString_t MSG_ReadString = MSG_ReadString_t(0x60E2B0); MSG_ReadBigString_t MSG_ReadBigString = MSG_ReadBigString_t(0x60E2B0);
MSG_ReadStringLine_t MSG_ReadStringLine = MSG_ReadStringLine_t(0x4FEF30); MSG_ReadStringLine_t MSG_ReadStringLine = MSG_ReadStringLine_t(0x4FEF30);
MSG_WriteByte_t MSG_WriteByte = MSG_WriteByte_t(0x48C520); MSG_WriteByte_t MSG_WriteByte = MSG_WriteByte_t(0x48C520);
MSG_WriteData_t MSG_WriteData = MSG_WriteData_t(0x4F4120); MSG_WriteData_t MSG_WriteData = MSG_WriteData_t(0x4F4120);

4
src/Game/Functions.hpp
View File

@ -233,8 +233,8 @@ namespace Game
typedef __int64(*MSG_ReadInt64_t)(msg_t* msg); typedef __int64(*MSG_ReadInt64_t)(msg_t* msg);
extern MSG_ReadInt64_t MSG_ReadInt64; extern MSG_ReadInt64_t MSG_ReadInt64;
typedef char*(*MSG_ReadString_t)(msg_t* msg, char* string, unsigned int maxChars); typedef char*(*MSG_ReadBigString_t)(msg_t* msg);
extern MSG_ReadString_t MSG_ReadString; extern MSG_ReadBigString_t MSG_ReadBigString;
typedef char*(*MSG_ReadStringLine_t)(msg_t *msg, char *string, unsigned int maxChars); typedef char*(*MSG_ReadStringLine_t)(msg_t *msg, char *string, unsigned int maxChars);
extern MSG_ReadStringLine_t MSG_ReadStringLine; extern MSG_ReadStringLine_t MSG_ReadStringLine;