UNLOZE/sm-ext-A2SFixes
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hopefully fixed a potential memory leak + added A2S_PLAYER_REPLY functionality, I think.

Browse Source
This commit is contained in:
george 2019-05-21 02:00:50 +01:00
parent 12b109c564
commit 7bd2b07064
1 changed files with 51 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
extension.cpp
View File

@ -33,6 +33,8 @@
#include "string.h" #include "string.h"
#include "sys/socket.h" #include "sys/socket.h"
#include "CDetour/detours.h" #include "CDetour/detours.h"
#include <bitbuf.h>
#include <inetchannel.h>
#define DETOUR_CREATE_MEMBER_ADDRESS(name, address) CDetourManager::CreateDetour(GET_MEMBER_CALLBACK(name), GET_MEMBER_TRAMPOLINE(name), address); #define DETOUR_CREATE_MEMBER_ADDRESS(name, address) CDetourManager::CreateDetour(GET_MEMBER_CALLBACK(name), GET_MEMBER_TRAMPOLINE(name), address);
#define DETOUR_CREATE_STATIC_ADDRESS(name, address) CDetourManager::CreateDetour(GET_STATIC_CALLBACK(name), GET_STATIC_TRAMPOLINE(name), address); #define DETOUR_CREATE_STATIC_ADDRESS(name, address) CDetourManager::CreateDetour(GET_STATIC_CALLBACK(name), GET_STATIC_TRAMPOLINE(name), address);
@ -54,6 +56,12 @@ SMEXT_LINK(&g_Interface);
CDetour *g_pDetour_SendTo = NULL; CDetour *g_pDetour_SendTo = NULL;
CDetour *g_pDetour_RecvFrom = NULL; CDetour *g_pDetour_RecvFrom = NULL;
char g_PlayerReply[1024];
bf_write g_PlayerReplyPacket(PlayerReply, 1024);
char *NewBuf;
char *OldBuf;
/** /**
* @brief * @brief
*/ */
@ -63,9 +71,7 @@ DETOUR_DECL_STATIC6(Detour_SendTo, int, int, s, char *, buf, int, len, int, flag
{ {
// g_pSM->LogMessage(myself, "A2S_INFO_REPLY: %s", buf); // g_pSM->LogMessage(myself, "A2S_INFO_REPLY: %s", buf);
char *NewBuf; delete[] NewBuf;
char *OldBuf;
NewBuf = new char[len]; NewBuf = new char[len];
memcpy(NewBuf, buf, len); memcpy(NewBuf, buf, len);
OldBuf = NewBuf; OldBuf = NewBuf;
@ -109,7 +115,7 @@ DETOUR_DECL_STATIC6(Detour_SendTo, int, int, s, char *, buf, int, len, int, flag
if (pPlayer != NULL && pPlayer->IsConnected() && !pPlayer->IsSourceTV()) if (pPlayer != NULL && pPlayer->IsConnected() && !pPlayer->IsSourceTV())
{ {
iPlayers += 1; iPlayers++;
} }
} }
@ -122,10 +128,47 @@ DETOUR_DECL_STATIC6(Detour_SendTo, int, int, s, char *, buf, int, len, int, flag
return DETOUR_STATIC_CALL(Detour_SendTo)(s, NewBuf, len, flags, to, tolen); return DETOUR_STATIC_CALL(Detour_SendTo)(s, NewBuf, len, flags, to, tolen);
} }
// if (memcmp(buf, A2S_PLAYER_REPLY, 5) == 0) if (memcmp(buf, A2S_PLAYER_REPLY, 5) == 0)
// { {
// g_pSM->LogMessage(myself, "A2S_PLAYER_REPLY: %s", buf); g_pSM->LogMessage(myself, "A2S_PLAYER_REPLY: %s", buf);
// }
g_PlayerReply.Reset(); //build up the packet as a bitbuffer so we can use the nice helper functions to do the work for us
g_PlayerReply.WriteLong(-1);//FF FF FF FF
g_PlayerReply.WriteByte(68);//44
g_PlayerReply.WriteByte(playerhelpers->GetNumPlayers()); //number of players
int iPlayers = 0;
for (int index = 0; index <= SM_MAXPLAYERS; index++)
{
IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(index);
if (pPlayer != NULL && pPlayer->IsConnected() && pPlayer->IsInGame() && !pPlayer->IsSourceTV())
{
IPlayerInfo *pInfo = pPlayer->GetPlayerInfo();
INetChannelInfo *pNetInfo = engine->GetPlayerNetInfo(client);
g_PlayerReply.WriteByte(iPlayers);
g_PlayerReply.WriteString(pPlayer->GetName());
if(pInfo != NULL)
g_PlayerReply.WriteLong(pInfo->GetFragCount());
else
g_PlayerReply.WriteLong(0);
if(pNetInfo != NULL)
g_PlayerReply.WriteFloat(pNetInfo->GetTimeConnected());
else
g_PlayerReply.WriteFloat(0.0);
iPlayers++;
}
}
return DETOUR_STATIC_CALL(Detour_SendTo)(s, (const char *)g_PlayerReply.GetData(), g_PlayerReply.GetNumBytesWritten(), flags, to, tolen);
}
return DETOUR_STATIC_CALL(Detour_SendTo)(s, buf, len, flags, to, tolen); return DETOUR_STATIC_CALL(Detour_SendTo)(s, buf, len, flags, to, tolen);
} }