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

Fix OnSpectatorDisconnect forward on linux

Browse Source 
Multiple inheritance is killing me:(
The engine calls CGameClient::Disconnect, but we've only hooked
IClient::Disconnect, which uses a seperate vtable.
Our own SourceTV_KickClient native calls the IClient variant though, so
we need to hook both on linux to catch all cases.
This commit is contained in:
Peace-Maker 2016-03-17 13:39:52 +01:00
parent 47154ca72b
commit 7b79fa4299
3 changed files with 74 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
forwards.cpp
View File

@ -49,10 +49,18 @@ SH_DECL_HOOK0_void(IDemoRecorder, StopRecording, SH_NOATTRIB, 0)
SH_DECL_MANUALHOOK13(CHLTVServer_ConnectClient, 0, 0, 0, IClient *, const netadr_t &, int, int, int, const char *, const char *, const char *, int, CUtlVector<NetMsg_SplitPlayerConnect *> &, bool, CrossPlayPlatform_t, const unsigned char *, int);
SH_DECL_MANUALHOOK1_void_vafmt(CHLTVServer_RejectConnection, 0, 0, 0, const netadr_t &);
SH_DECL_HOOK1_void(IClient, Disconnect, SH_NOATTRIB, 0, const char *);
#ifndef WIN32
SH_DECL_MANUALHOOK1_void(CBaseClient_Disconnect, 0, 0, 0, const char *);
#endif // !WIN32
#else
SH_DECL_MANUALHOOK9(CHLTVServer_ConnectClient, 0, 0, 0, IClient *, netadr_t &, int, int, int, int, const char *, const char *, const char *, int);
SH_DECL_MANUALHOOK3_void(CHLTVServer_RejectConnection, 0, 0, 0, const netadr_t &, int, const char *);
SH_DECL_HOOK0_void_vafmt(IClient, Disconnect, SH_NOATTRIB, 0);
#ifndef WIN32
SH_DECL_MANUALHOOK0_void_vafmt(CBaseClient_Disconnect, 0, 0, 0);
#endif // !WIN32
#endif
SH_DECL_MANUALHOOK0_void(CBaseClient_ActivatePlayer, 0, 0, 0);
@ -101,6 +109,18 @@ void CForwardManager::Init()
m_bHasActivatePlayerOffset = true;
}
#ifndef WIN32
if (!g_pGameConf->GetOffset("CBaseClient::Disconnect", &offset) || offset == -1)
{
smutils->LogError(myself, "Failed to get CBaseClient::Disconnect offset.");
}
else
{
SH_MANUALHOOK_RECONFIGURE(CBaseClient_Disconnect, offset, 0, 0);
m_bHasDisconnectOffset = true;
}
#endif
m_StartRecordingFwd = forwards->CreateForward("SourceTV_OnStartRecording", ET_Ignore, 2, NULL, Param_Cell, Param_String);
m_StopRecordingFwd = forwards->CreateForward("SourceTV_OnStopRecording", ET_Ignore, 3, NULL, Param_Cell, Param_String, Param_Cell);
m_SpectatorPreConnectFwd = forwards->CreateForward("SourceTV_OnSpectatorPreConnect", ET_LowEvent, 4, NULL, Param_String, Param_String, Param_String, Param_String);
@ -186,22 +206,30 @@ void CForwardManager::UnhookServer(HLTVServerWrapper *wrapper)
void CForwardManager::HookClient(IClient *client)
{
void *pGameClient = (void *)((intptr_t)client - 4);
if (m_bHasActivatePlayerOffset)
{
void *pGameClient = (void *)((intptr_t)client - 4);
SH_ADD_MANUALHOOK(CBaseClient_ActivatePlayer, pGameClient, SH_MEMBER(this, &CForwardManager::OnSpectatorPutInServer), true);
}
SH_ADD_HOOK(IClient, Disconnect, client, SH_MEMBER(this, &CForwardManager::OnSpectatorDisconnect), false);
// Linux' engine uses the CGameClient vtable internally, but we're using the IClient vtable to kick players.
// Need to hook both to catch all cases >.<
SH_ADD_HOOK(IClient, Disconnect, client, SH_MEMBER(this, &CForwardManager::IClient_OnSpectatorDisconnect), false);
#ifndef WIN32
if (m_bHasDisconnectOffset)
SH_ADD_MANUALHOOK(CBaseClient_Disconnect, pGameClient, SH_MEMBER(this, &CForwardManager::BaseClient_OnSpectatorDisconnect), false);
#endif
}
void CForwardManager::UnhookClient(IClient *client)
{
void *pGameClient = (void *)((intptr_t)client - 4);
if (m_bHasActivatePlayerOffset)
{
void *pGameClient = (void *)((intptr_t)client - 4);
SH_REMOVE_MANUALHOOK(CBaseClient_ActivatePlayer, pGameClient, SH_MEMBER(this, &CForwardManager::OnSpectatorPutInServer), true);
}
SH_REMOVE_HOOK(IClient, Disconnect, client, SH_MEMBER(this, &CForwardManager::OnSpectatorDisconnect), false);
SH_REMOVE_HOOK(IClient, Disconnect, client, SH_MEMBER(this, &CForwardManager::IClient_OnSpectatorDisconnect), false);
#ifndef WIN32
if (m_bHasDisconnectOffset)
SH_REMOVE_MANUALHOOK(CBaseClient_Disconnect, pGameClient, SH_MEMBER(this, &CForwardManager::BaseClient_OnSpectatorDisconnect), false);
#endif
}
void CForwardManager::CallOnServerStart(IHLTVServer *server)
@ -330,12 +358,31 @@ int CForwardManager::OnGetChallengeType(const netadr_t &address)
RETURN_META_VALUE(MRES_SUPERCEDE, k_EAuthProtocolSteam);
}
void CForwardManager::OnSpectatorDisconnect(const char *reason)
void CForwardManager::BaseClient_OnSpectatorDisconnect(const char *reason)
{
void *pGameClient = META_IFACEPTR(void);
if (!pGameClient)
RETURN_META(MRES_IGNORED);
IClient *client = (IClient *)((intptr_t)pGameClient + 4);
HandleSpectatorDisconnect(client, reason);
RETURN_META(MRES_SUPERCEDE);
}
void CForwardManager::IClient_OnSpectatorDisconnect(const char *reason)
{
IClient *client = META_IFACEPTR(IClient);
if (!client)
RETURN_META(MRES_IGNORED);
HandleSpectatorDisconnect(client, reason);
RETURN_META(MRES_SUPERCEDE);
}
void CForwardManager::HandleSpectatorDisconnect(IClient *client, const char *reason)
{
UnhookClient(client);
char disconnectReason[255];
@ -346,6 +393,8 @@ void CForwardManager::OnSpectatorDisconnect(const char *reason)
m_SpectatorDisconnectFwd->PushStringEx(disconnectReason, 255, SM_PARAM_STRING_UTF8 | SM_PARAM_STRING_COPY, SM_PARAM_COPYBACK);
m_SpectatorDisconnectFwd->Execute();
// We always call the IClient::Disconnect variant, even if we're coming from CGameClient::Disconnect on linux.
// They point to the same function in the engine though. Could only confuse other hooks, so might need to revisit this.
#if SOURCE_ENGINE == SE_CSGO
SH_CALL(client, &IClient::Disconnect)(disconnectReason);
#else
@ -355,8 +404,6 @@ void CForwardManager::OnSpectatorDisconnect(const char *reason)
m_SpectatorDisconnectedFwd->PushCell(clientIndex);
m_SpectatorDisconnectedFwd->PushString(disconnectReason);
m_SpectatorDisconnectedFwd->Execute();
RETURN_META(MRES_SUPERCEDE);
}
void CForwardManager::OnSpectatorPutInServer()

7
forwards.h
View File

@ -95,11 +95,15 @@ private:
void OnStopRecording();
IClient *OnSpectatorConnect(netadr_t &address, int nProtocol, int iChallenge, int iClientChallenge, int nAuthProtocol, const char *pchName, const char *pchPassword, const char *pCookie, int cbCookie);
#endif
void OnSpectatorDisconnect(const char *reason);
void BaseClient_OnSpectatorDisconnect(const char *reason);
void IClient_OnSpectatorDisconnect(const char *reason);
void OnSpectatorPutInServer();
int OnGetChallengeType(const netadr_t &address);
private:
void HandleSpectatorDisconnect(IClient *client, const char *reason);
private:
IForward *m_StartRecordingFwd;
IForward *m_StopRecordingFwd;
@ -116,6 +120,7 @@ private:
bool m_bHasRejectConnectionOffset = false;
bool m_bHasGetChallengeTypeOffset = false;
bool m_bHasActivatePlayerOffset = false;
bool m_bHasDisconnectOffset = false;
// Only need the detours on linux. Windows always uses its vtables..
#ifndef WIN32

10
sourcetvmanager.games.txt
View File

@ -63,6 +63,11 @@
"linux" "65"
}
"CBaseClient::Disconnect"
{
"linux" "16"
}
"CHLTVServer::Shutdown"
{
"windows" "45"
@ -212,6 +217,11 @@
"linux" "56"
}
"CBaseClient::Disconnect"
{
"linux" "14"
}
"CHLTVServer::Shutdown"
{
"windows" "41"