update(hooks): SendNetMessage

Author: skuzzis

plugin_files/gamedata/signatures.json

@@ -89,11 +89,6 @@
         "windows": "48 89 74 24 2A 55 41 54 41 55 41 56 41 57 48 8D 6C 24 2A 48 81 EC 2A 2A 2A 2A 4C 8B F9",
         "linux": "55 48 89 E5 41 57 41 56 41 55 49 89 FD 41 54 45 89 C4"
     },
-    "SendNetMessage": {
-        "lib": "networksystem",
-        "windows": "48 89 5C 24 10 48 89 6C 24 18 56 57 41 56 48 83 EC 40 48 8D A9 D8 75 00 00",
-        "linux": "55 48 89 E5 41 57 41 56 4C 8D B7 18 76 00 00 41 55 49 89 F5"
-    },
     "HostStateRequest": {
         "lib": "engine2",
         "windows": "48 89 74 24 10 57 48 83 EC 30 33 F6 48 8B FA",

src/addons/addons.cpp

@@ -16,6 +16,7 @@
 #include <cmath>
 #include <algorithm>
 
+#include "../../vendor/dynlib/module.h"
 #include "networkbasetypes.pb.h"
 
 #define HAS_MEMBER(DOCUMENT, MEMBER_NAME, MEMBER_PATH) \
@@ -35,7 +36,9 @@
     if (!DOCUMENT[MEMBER_NAME].IsUint())            \
     return AddonsPrint(string_format("The field \"%s\" is not an unsigned integer.", MEMBER_PATH))
 
-FuncHook<decltype(Hook_SendNetMessage)> TSendNetMessage(Hook_SendNetMessage, "SendNetMessage");
+SH_DECL_MANUALHOOK2(SendNetMessage, WIN_LINUX(15, 16), 0, 0, bool, CNetMessage*, NetChannelBufType_t);
+int sendNetMessageHookID = -1;
+
 FuncHook<decltype(Hook_HostStateRequest)> THostStateRequest(Hook_HostStateRequest, "HostStateRequest");
 
 size_t FormatArgs(char* buffer, size_t maxlength, const char* fmt, va_list params)
@@ -65,30 +68,6 @@ const char* format(const char* str, ...)
     return return_str.c_str();
 }
 
-void Hook_SendNetMessage(INetChannel* pNetChan, CNetMessage* pData, NetChannelBufType_t bufType)
-{
-    NetMessageInfo_t* info = pData->GetNetMessage()->GetNetMessageInfo();
-
-    if (!UserMessages_SendNetMessage(pNetChan, pData, bufType))
-        return;
-
-    if (info->m_MessageId != 7 || g_addons.GetStatus() == false || g_addons.GetAddons().size() == 0)
-        return TSendNetMessage(pNetChan, pData, bufType);
-
-    ClientJoinInfo_t* pPendingClient = GetPendingClient(pNetChan);
-
-    if (pPendingClient)
-    {
-        auto pMsg = pData->ToPB<CNETMsg_SignonState>();
-        pMsg->set_addons(g_addons.GetAddons()[pPendingClient->addon].c_str());
-        pMsg->set_signon_state(SIGNONSTATE_CHANGELEVEL);
-
-        pPendingClient->signon_timestamp = Plat_FloatTime();
-    }
-
-    TSendNetMessage(pNetChan, pData, bufType);
-}
-
 void* Hook_HostStateRequest(void* a1, void** pRequest)
 {
     if (g_addons.GetStatus() == false || g_addons.GetAddons().size() == 0)
@@ -135,6 +114,40 @@ void AddonsPrint(std::string str)
     PLUGIN_PRINTF("Addons", "%s\n", str.c_str());
 }
 
+void Addons::Initialize()
+{
+    DynLibUtils::CModule enginemodule("engine2");
+    void* serverSideClientVTable = enginemodule.GetVirtualTableByName("CServerSideClient");
+    sendNetMessageHookID = SH_ADD_MANUALDVPHOOK(SendNetMessage, serverSideClientVTable, SH_MEMBER(this, &Addons::SendNetMessage), false);
+}
+
+void Addons::Destroy()
+{
+    SH_REMOVE_HOOK_ID(sendNetMessageHookID);
+}
+
+bool Addons::SendNetMessage(CNetMessage* pData, NetChannelBufType_t bufType)
+{
+    CServerSideClient* pClient = META_IFACEPTR(CServerSideClient);
+    NetMessageInfo_t* info = pData->GetNetMessage()->GetNetMessageInfo();
+    if (!UserMessages_SendNetMessage(pClient->GetNetChannel(), pData, bufType))
+        RETURN_META_VALUE(MRES_SUPERCEDE, false);
+
+    if (info->m_MessageId != 7 || g_addons.GetStatus() == false || g_addons.GetAddons().size() == 0)
+        RETURN_META_VALUE(MRES_IGNORED, true);
+
+    ClientJoinInfo_t* pPendingClient = GetPendingClient(pClient->GetNetChannel());
+    if (pPendingClient)
+    {
+        auto pMsg = pData->ToPB<CNETMsg_SignonState>();
+        pMsg->set_addons(g_addons.GetAddons()[pPendingClient->addon].c_str());
+        pMsg->set_signon_state(SIGNONSTATE_CHANGELEVEL);
+        pPendingClient->signon_timestamp = Plat_FloatTime();
+    }
+
+    RETURN_META_VALUE(MRES_HANDLED, true);
+}
+
 void Addons::BuildAddonPath(std::string pszAddon, std::string& buffer)
 {
     static CBufferStringGrowable<MAX_PATH> s_sWorkingDir;

src/addons/addons.h

@@ -14,7 +14,6 @@
 
 #include <vector>
 
-void Hook_SendNetMessage(INetChannel *pNetChan, CNetMessage *pData, NetChannelBufType_t bufType);
 void *Hook_HostStateRequest(void *a1, void **pRequest);
 
 struct DownloadInfo
@@ -75,6 +74,10 @@ class Addons
     bool OnClientConnect(uint64 xuid);
 
     void ReloadMap();
+
+    void Initialize();
+    void Destroy();
+    bool SendNetMessage(CNetMessage* msg, NetChannelBufType_t bufType);
 };
 
 extern Addons g_addons;

src/entrypoint.cpp

@@ -179,6 +179,7 @@ bool Swiftly::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
     g_dbManager->LoadDatabases();
 
     g_addons.LoadAddons();
+    g_addons.Initialize();
 
     if (!InitializeHooks())
         PRINTRET("Hooks failed to initialize.\n", false)
@@ -246,6 +247,7 @@ bool Swiftly::Unload(char* error, size_t maxlen)
     UnloadHooks();
     UnregisterEventListeners();
     g_voiceManager.OnShutdown();
+    g_addons.Destroy();
 
     SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, GameFrame, server, this, &Swiftly::Hook_GameFrame, true);
     SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, gameclients, this, &Swiftly::Hook_ClientDisconnect, true);