Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/game/backend/PlayerData.hpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#pragma once
#include <chrono>
#include <unordered_set>

#include "types/network/netSocketAddress.hpp"
namespace YimMenu
{
class PlayerData
{
public:
bool m_IsModder{};
bool m_RunFreemodeStateKick{};
netSocketAddress m_InternalAddress{};
netSocketAddress m_ExternalAddress{};
bool m_HasAddresses{};
};
}
6 changes: 5 additions & 1 deletion src/game/frontend/submenus/Player/Info.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,11 @@ namespace YimMenu::Submenus


auto ip = Players::GetSelected().GetExternalAddress();

auto& playerData = Players::GetSelected().GetData();
if (playerData.m_HasAddresses)
{
ip = playerData.m_ExternalAddress;
}
auto addr2 = BuildIPStr(ip.m_IpAddress.m_Field1, ip.m_IpAddress.m_Field2, ip.m_IpAddress.m_Field3, ip.m_IpAddress.m_Field4);

ImGui::Text("IP Address:");
Expand Down
13 changes: 13 additions & 0 deletions src/game/hooks/Network/ReceiveNetMessage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,19 @@ namespace YimMenu::Hooks
auto fr_evt = reinterpret_cast<rage::netEventFrameReceived*>(event);
rage::datBitBuffer buffer(fr_evt->m_Data, fr_evt->m_Length, true);

// Capture real IP address from network event
auto player = Players::GetByMessageId(fr_evt->m_MsgId);
if (player && player.IsValid())
{
auto& playerData = Players::GetPlayerData(player.GetId());
if (!playerData.m_HasAddresses)
{
playerData.m_ExternalAddress = fr_evt->m_Address.m_ExternalIp;
playerData.m_InternalAddress = fr_evt->m_Address.m_InternalIp;
playerData.m_HasAddresses = true;
}
}

rage::netMessage::Type type = ReadType(buffer).value_or(rage::netMessage::Type::Invalid);

switch (type)
Expand Down