add sender to event logger

Author: Poggu

src/cs2_sdk/serversideclient.h

@@ -0,0 +1,43 @@
+#pragma once
+
+#include "playerslot.h"
+#include "steam/steamclientpublic.h"
+#include "utlstring.h"
+#include "inetchannel.h"
+
+class INetworkMessageProcessingPreFilter
+{
+public:
+	virtual void FilterMessage() = 0;
+
+	INetChannel* GetNetChannel() const { return m_NetChannel; }
+	CPlayerSlot GetPlayerSlot() const { return m_nClientSlot; }
+	CPlayerUserId GetUserID() const { return m_UserID; }
+	int GetSignonState() const { return m_nSignonState; }
+	CSteamID* GetClientSteamID() const { return (CSteamID*)&m_SteamID; }
+	const char* GetClientName() const { return m_Name.Get(); }
+	netadr_t* GetRemoteAddress() const { return (netadr_t*)&m_NetAdr; }
+
+private:
+	[[maybe_unused]] char pad1[0x40];
+#ifdef __linux__
+	[[maybe_unused]] char pad2[0x10];
+#endif
+	INetChannel* m_NetChannel;		// 80 | 96
+	[[maybe_unused]] char pad3[0x4];
+	int32 m_nSignonState;			// 92 | 108
+	[[maybe_unused]] char pad4[0x38];
+	bool m_bFakePlayer;				// 152 | 168
+	[[maybe_unused]] char pad5[0x7];
+	CPlayerUserId m_UserID;			// 160 | 176
+	[[maybe_unused]] char pad6[0x1];
+	CSteamID m_SteamID;				// 163 | 179
+	[[maybe_unused]] char pad7[0x25];
+	CPlayerSlot m_nClientSlot;		// 208 | 224
+	CEntityIndex m_nEntityIndex;	// 212 | 228
+	CUtlString m_Name;				// 216 | 232
+	[[maybe_unused]] char pad8[0x20];
+	netadr_t m_NetAdr;				// 256 | 272
+	[[maybe_unused]] char pad9[0x40];
+	int m_nDeltaTick;				// 332 | 348
+};

src/extension.cpp

@@ -38,6 +38,7 @@
 #include "../protobufs/generated/usercmd.pb.h"
 #include "../protobufs/generated/cs_usercmd.pb.h"
 #include "networksystem/inetworkmessages.h"
+#include "cs2_sdk/serversideclient.h"
 
 #ifdef _WIN32
 #define ROOTBIN "/bin/win64/"
@@ -50,7 +51,7 @@
 CS2ServerGUI g_CS2ServerGUI;
 std::thread g_thread;
 
-typedef bool (*FilterMessage_t)(void* player, INetworkSerializable* pEvent, void* pData, void* pNetChan);
+typedef bool (*FilterMessage_t)(INetworkMessageProcessingPreFilter* player, INetworkSerializable* pEvent, void* pData, void* pNetChan);
 FilterMessage_t g_pFilterMessage = nullptr;
 funchook_t* g_pHook = nullptr;
 
@@ -127,8 +128,11 @@ bool ReadPBFromBuffer(bf_read& buffer, T& pb)
 	return true;
 }
 
-bool Detour_FilterMessage(void* player, INetworkSerializable* pEvent, void* pData, void* pNetChan)
+bool Detour_FilterMessage(INetworkMessageProcessingPreFilter* player, INetworkSerializable* pEvent, void* pData, void* pNetChan)
 {
+	if(!GUI::g_GUICtx.m_WindowStates.m_bEventLogger)
+		return g_pFilterMessage(player, pEvent, pData, pNetChan);
+
 	NetMessageInfo_t* info = pEvent->GetNetMessageInfo();
 	if (info)
 	{
@@ -144,7 +148,7 @@ bool Detour_FilterMessage(void* player, INetworkSerializable* pEvent, void* pDat
 				{
 					CSGOUserCmdPB userCmd;
 					if (ReadPBFromBuffer(buffer, userCmd))
-						GUI::EventLogger::AddEventLog(std::string(info->m_pBinding->GetName()), std::string(userCmd.DebugString().c_str()), true);
+						GUI::EventLogger::AddEventLog(std::string(info->m_pBinding->GetName()), std::string(userCmd.DebugString().c_str()), true, std::string(player->GetClientName()));
 				}
 			}
 		}
@@ -153,7 +157,7 @@ bool Detour_FilterMessage(void* player, INetworkSerializable* pEvent, void* pDat
 			CUtlString str;
 			info->m_pBinding->ToString(pData, str);
 
-			GUI::EventLogger::AddEventLog(std::string(info->m_pBinding->GetName()), std::string(str.String()), true);
+			GUI::EventLogger::AddEventLog(std::string(info->m_pBinding->GetName()), std::string(str.String()), true, std::string(player->GetClientName()));
 		}
 	}
 

src/imgui/panels/eventlogger/eventlogger.cpp

@@ -13,6 +13,7 @@ struct EventLog
 {
 	std::string name;
 	std::string data;
+	std::string senderName;
 	bool ingress;
 };
 
@@ -22,13 +23,13 @@ static size_t globalId = 0;
 static size_t selectedId = -1;
 static bool paused = false;
 
-void AddEventLog(std::string&& name, std::string&& data, bool ingress)
+void AddEventLog(std::string&& name, std::string&& data, bool ingress, std::string&& senderName)
 {
 	if(paused)
 		return;
 
 	std::lock_guard<std::mutex> lock(eventLogLock);
-	vecEventLogs[globalId++] = { std::move(name), std::move(data), ingress };
+	vecEventLogs[globalId++] = { std::move(name), std::move(data),senderName, ingress };
 
 	if(vecEventLogs.size() > 500)
 		vecEventLogs.erase(vecEventLogs.begin());
@@ -46,9 +47,11 @@ void DrawTable(bool ingress)
 
 	logFilter.Draw("Search");
 
-	if (ImGui::BeginTable("Event Table", 1))
+	if (ImGui::BeginTable("Event Table", ingress ? 2 : 1))
 	{
 		ImGui::TableSetupColumn("Name");
+		if (ingress)
+			ImGui::TableSetupColumn("Sender");
 		ImGui::TableHeadersRow();
 
 		size_t i = vecEventLogs.size() - 1;
@@ -74,6 +77,12 @@ void DrawTable(bool ingress)
 					selectedId = rit->first;
 				}
 				ImGui::PopID();
+
+				if (ingress)
+				{
+					ImGui::TableNextColumn();
+					ImGui::Text(event.senderName.c_str());
+				}
 			}
 		}
 

src/imgui/panels/eventlogger/eventlogger.h

@@ -3,7 +3,7 @@
 namespace GUI::EventLogger
 {
 
-void AddEventLog(std::string&& name, std::string&& data, bool ingress);
+void AddEventLog(std::string&& name, std::string&& data, bool ingress, std::string&& senderName = "");
 void Draw(bool* isOpen);
 
 } // namespace GUI::EventLogger