ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-18 13:57:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2613 from Haselnussbomber/update-netmonwidget

Browse source 
Update Network Monitor Widget
This commit is contained in:
goat 2026-02-08 12:37:04 +01:00 • committed by GitHub
commit 5044aeda2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Dalamud/Interface/Internal/Windows/Data/Widgets/NetworkMonitorWidget.cs
View file

@ -21,10 +21,11 @@ internal unsafe class NetworkMonitorWidget : IDataWindowWidget
{ {
private readonly ConcurrentQueue<NetworkPacketData> packets = new(); private readonly ConcurrentQueue<NetworkPacketData> packets = new();
private Hook<PacketDispatcher.Delegates.OnReceivePacket>? hookDown; private Hook<PacketDispatcher.Delegates.OnReceivePacket>? hookZoneDown;
private Hook<ZoneClient.Delegates.SendPacket>? hookUp; private Hook<ZoneClient.Delegates.SendPacket>? hookZoneUp;
private bool trackNetwork; private bool trackZoneUp;
private bool trackZoneDown;
private int trackedPackets = 20; private int trackedPackets = 20;
private ulong nextPacketIndex; private ulong nextPacketIndex;
private string filterString = string.Empty; private string filterString = string.Empty;
@ -35,8 +36,8 @@ internal unsafe class NetworkMonitorWidget : IDataWindowWidget
/// <summary> Finalizes an instance of the <see cref="NetworkMonitorWidget"/> class. </summary> /// <summary> Finalizes an instance of the <see cref="NetworkMonitorWidget"/> class. </summary>
~NetworkMonitorWidget() ~NetworkMonitorWidget()
{ {
this.hookDown?.Dispose(); this.hookZoneDown?.Dispose();
this.hookUp?.Dispose(); this.hookZoneUp?.Dispose();
} }
private enum NetworkMessageDirection private enum NetworkMessageDirection
@ -60,26 +61,41 @@ internal unsafe class NetworkMonitorWidget : IDataWindowWidget
/// <inheritdoc/> /// <inheritdoc/>
public void Draw() public void Draw()
{ {
this.hookDown ??= Hook<PacketDispatcher.Delegates.OnReceivePacket>.FromAddress( this.hookZoneDown ??= Hook<PacketDispatcher.Delegates.OnReceivePacket>.FromAddress(
(nint)PacketDispatcher.StaticVirtualTablePointer->OnReceivePacket, (nint)PacketDispatcher.StaticVirtualTablePointer->OnReceivePacket,
this.OnReceivePacketDetour); this.OnReceivePacketDetour);
this.hookUp ??= Hook<ZoneClient.Delegates.SendPacket>.FromAddress( this.hookZoneUp ??= Hook<ZoneClient.Delegates.SendPacket>.FromAddress(
(nint)ZoneClient.MemberFunctionPointers.SendPacket, (nint)ZoneClient.MemberFunctionPointers.SendPacket,
this.SendPacketDetour); this.SendPacketDetour);
if (ImGui.Checkbox("Track Network Packets"u8, ref this.trackNetwork)) if (ImGui.Checkbox("Track ZoneUp"u8, ref this.trackZoneUp))
{ {
if (this.trackNetwork) if (this.trackZoneUp)
{ {
this.nextPacketIndex = 0; if (!this.trackZoneDown)
this.hookDown?.Enable(); this.nextPacketIndex = 0;
this.hookUp?.Enable();
this.hookZoneUp?.Enable();
} }
else else
{ {
this.hookDown?.Disable(); this.hookZoneUp?.Disable();
this.hookUp?.Disable(); }
}
if (ImGui.Checkbox("Track ZoneDown"u8, ref this.trackZoneDown))
{
if (this.trackZoneDown)
{
if (!this.trackZoneUp)
this.nextPacketIndex = 0;
this.hookZoneDown?.Enable();
}
else
{
this.hookZoneDown?.Disable();
} }
} }
@ -92,6 +108,7 @@ internal unsafe class NetworkMonitorWidget : IDataWindowWidget
if (ImGui.Button("Clear Stored Packets"u8)) if (ImGui.Button("Clear Stored Packets"u8))
{ {
this.packets.Clear(); this.packets.Clear();
this.nextPacketIndex = 0;
} }
ImGui.SameLine(); ImGui.SameLine();
@ -102,7 +119,7 @@ internal unsafe class NetworkMonitorWidget : IDataWindowWidget
ImGui.SameLine(0, ImGui.GetStyle().ItemInnerSpacing.X); ImGui.SameLine(0, ImGui.GetStyle().ItemInnerSpacing.X);
ImGui.Checkbox("##FilterRecording"u8, ref this.filterRecording); ImGui.Checkbox("##FilterRecording"u8, ref this.filterRecording);
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
ImGui.SetTooltip("Apply filter to incoming packets.\nUncheck to record all packets and filter the table instead."u8); ImGui.SetTooltip("When enabled, packets are filtered before being recorded.\nWhen disabled, all packets are recorded and filtering only affects packets displayed in the table."u8);
ImGui.SameLine(0, ImGui.GetStyle().ItemInnerSpacing.X); ImGui.SameLine(0, ImGui.GetStyle().ItemInnerSpacing.X);
ImGuiComponents.HelpMarker("Enter OpCodes in a comma-separated list.\nRanges are supported. Exclude OpCodes with exclamation mark.\nExample: -400,!50-100,650,700-980,!941"); ImGuiComponents.HelpMarker("Enter OpCodes in a comma-separated list.\nRanges are supported. Exclude OpCodes with exclamation mark.\nExample: -400,!50-100,650,700-980,!941");
@ -204,14 +221,14 @@ internal unsafe class NetworkMonitorWidget : IDataWindowWidget
var opCode = *(ushort*)(packet + 2); var opCode = *(ushort*)(packet + 2);
var targetName = GetTargetName(targetId); var targetName = GetTargetName(targetId);
this.RecordPacket(new NetworkPacketData(Interlocked.Increment(ref this.nextPacketIndex), DateTime.Now, opCode, NetworkMessageDirection.ZoneDown, targetId, targetName)); this.RecordPacket(new NetworkPacketData(Interlocked.Increment(ref this.nextPacketIndex), DateTime.Now, opCode, NetworkMessageDirection.ZoneDown, targetId, targetName));
this.hookDown.OriginalDisposeSafe(thisPtr, targetId, packet); this.hookZoneDown.OriginalDisposeSafe(thisPtr, targetId, packet);
} }
private bool SendPacketDetour(ZoneClient* thisPtr, nint packet, uint a3, uint a4, bool a5) private bool SendPacketDetour(ZoneClient* thisPtr, nint packet, uint a3, uint a4, bool a5)
{ {
var opCode = *(ushort*)packet; var opCode = *(ushort*)packet;
this.RecordPacket(new NetworkPacketData(Interlocked.Increment(ref this.nextPacketIndex), DateTime.Now, opCode, NetworkMessageDirection.ZoneUp, 0, string.Empty)); this.RecordPacket(new NetworkPacketData(Interlocked.Increment(ref this.nextPacketIndex), DateTime.Now, opCode, NetworkMessageDirection.ZoneUp, 0, string.Empty));
return this.hookUp.OriginalDisposeSafe(thisPtr, packet, a3, a4, a5); return this.hookZoneUp.OriginalDisposeSafe(thisPtr, packet, a3, a4, a5);
} }
private void RecordPacket(NetworkPacketData packet) private void RecordPacket(NetworkPacketData packet)