ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-23 16:27:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: yet another network api rework

Browse source
This commit is contained in:
goat 2020-05-06 01:38:43 +02:00
parent 8072f91f51
commit b48d00c0f3
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Dalamud/Game/Internal/Network/GameNetwork.cs
View file

@ -23,7 +23,7 @@ namespace Dalamud.Game.Internal.Network {
private GameNetworkAddressResolver Address { get; } private GameNetworkAddressResolver Address { get; }
private IntPtr baseAddress; private IntPtr baseAddress;
public delegate void OnNetworkMessageDelegate(IntPtr dataPtr, ushort opCode, uint targetId, NetworkMessageDirection direction); public delegate void OnNetworkMessageDelegate(IntPtr dataPtr, ushort opCode, uint sourceActorId, uint targetActorId, NetworkMessageDirection direction);
/// <summary> /// <summary>
/// Event that is called when a network message is sent/received. /// Event that is called when a network message is sent/received.
@ -66,11 +66,16 @@ namespace Dalamud.Game.Internal.Network {
private void ProcessZonePacketDownDetour(IntPtr a, uint targetId, IntPtr dataPtr) { private void ProcessZonePacketDownDetour(IntPtr a, uint targetId, IntPtr dataPtr) {
this.baseAddress = a; this.baseAddress = a;
try { // Go back 0x10 to get back to the start of the packet header
// Call events dataPtr -= 0x10;
this.OnNetworkMessage?.Invoke(dataPtr + 0x10, (ushort) Marshal.ReadInt16(dataPtr, 2), targetId, NetworkMessageDirection.ZoneDown);
this.processZonePacketDownHook.Original(a, targetId, dataPtr); try {
// Call events
this.OnNetworkMessage?.Invoke(dataPtr + 0x20, (ushort) Marshal.ReadInt16(dataPtr, 0x12), 0, targetId, NetworkMessageDirection.ZoneDown);
this.processZonePacketDownHook.Original(a, targetId, dataPtr + 0x10);
} catch (Exception ex) { } catch (Exception ex) {
string header; string header;
try { try {
@ -83,7 +88,7 @@ namespace Dalamud.Game.Internal.Network {
Log.Error(ex, "Exception on ProcessZonePacketDown hook. Header: " + header); Log.Error(ex, "Exception on ProcessZonePacketDown hook. Header: " + header);
this.processZonePacketDownHook.Original(a, targetId, dataPtr); this.processZonePacketDownHook.Original(a, targetId, dataPtr + 0x10);
} }
} }
@ -92,13 +97,8 @@ namespace Dalamud.Game.Internal.Network {
try try
{ {
// Call events // Call events
this.OnNetworkMessage?.Invoke(dataPtr + 0x20, (ushort) Marshal.ReadInt16(dataPtr), 0x0, NetworkMessageDirection.ZoneUp); // TODO: Implement actor IDs
this.OnNetworkMessage?.Invoke(dataPtr + 0x20, (ushort) Marshal.ReadInt16(dataPtr), 0x0, 0x0, NetworkMessageDirection.ZoneUp);
var op = Marshal.ReadInt16(dataPtr);
var length = Marshal.ReadInt16(dataPtr, 8);
Log.Verbose("[ZONEUP] op: {0} len: {1}", op.ToString("X"), length);
Util.DumpMemory(dataPtr + 0x20, length);
} }
catch (Exception ex) catch (Exception ex)
{ {

2
Dalamud/Game/Network/NetworkHandlers.cs
View file

@ -37,7 +37,7 @@ namespace Dalamud.Game.Network {
} }
private void OnNetworkMessage(IntPtr dataPtr, ushort opCode, uint targetId, NetworkMessageDirection direction) { private void OnNetworkMessage(IntPtr dataPtr, ushort opCode, uint sourceActorId, uint targetActorId, NetworkMessageDirection direction) {
if (direction != NetworkMessageDirection.ZoneDown) if (direction != NetworkMessageDirection.ZoneDown)
return; return;