Merge pull request #1 from themeldingwars/localhost

Adjustments to facilitate localhost captures
themeldingwars · Feb 24, 2024 · 2717c7d · 2717c7d
2 parents eea8073 + 5890489
commit 2717c7d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/FauCap/Converter.cs b/FauCap/Converter.cs
@@ -49,8 +49,9 @@ public List<GameSession> PcapFileToFaucap(string InFile)
 
         void OnPacketArrival(object sender, CaptureEventArgs e)
         {
-            if (e.Packet.LinkLayerType == PacketDotNet.LinkLayers.Ethernet)
+            if (e.Packet.LinkLayerType == PacketDotNet.LinkLayers.Ethernet || e.Packet.LinkLayerType == PacketDotNet.LinkLayers.Null)
             {
+
                 var packet = PacketDotNet.Packet.ParsePacket(e.Packet.LinkLayerType, e.Packet.Data);
 
                 var udpPacket = (PacketDotNet.UdpPacket)packet.Extract<PacketDotNet.UdpPacket>();
@@ -61,7 +62,6 @@ void OnPacketArrival(object sender, CaptureEventArgs e)
                 byte[] data = udpPacket.PayloadData;
 
                 DateTime time = e.Packet.Timeval.Date;
-
                 if (IsHandshakePacket(data))
                 {
                     switch (Handshake.ReadName(data))
@@ -127,7 +127,8 @@ void OnPacketArrival(object sender, CaptureEventArgs e)
                 }
                 else if (data != null && CurrentStatus == Status.Hugged && Sessions.Last().SocketID == MemoryMarshal.Read<uint>(data))
                 {
-                    bool fromServer = ipPacket.DestinationAddress.Address == Sessions.Last().LocalIp.Address;
+
+                    bool fromServer = udpPacket.SourcePort == Sessions.Last().GameServerPort;
                     Sessions.Last().Datagrams.Add(new Datagram(Idx++, time, fromServer, data));
                 }
 

diff --git a/FauCap/FauCap.csproj b/FauCap/FauCap.csproj
@@ -9,9 +9,9 @@
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <Product>FauCap</Product>
     <Version>1.12.0.0</Version>
-    <AssemblyVersion>1.13.0.0</AssemblyVersion>
+    <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageVersion>1.13.0.0</PackageVersion>
+    <PackageVersion>1.14.0.0</PackageVersion>
   </PropertyGroup>
 
 

diff --git a/FauCap/PacketUtil.cs b/FauCap/PacketUtil.cs
@@ -61,7 +61,7 @@ public static ushort ReadSequenceStart(Span<byte> data)
             }
             public static ushort ReadGameServerPort(Span<byte> data)
             {
-                return MemoryMarshal.Read<ushort>(data.Slice(10, 2));
+                return ReadUInt16BigEndian(data.Slice(10, 2));
             }
         }
     }

diff --git a/FauCapParser/FauCapParser.csproj b/FauCapParser/FauCapParser.csproj
@@ -6,9 +6,9 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Company>TheMeldingWars</Company>
-    <AssemblyVersion>1.13.0.0</AssemblyVersion>
+    <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <Version>1.12.0.0</Version>
-    <PackageVersion>1.13.0.0</PackageVersion>
+    <PackageVersion>1.14.0.0</PackageVersion>
   </PropertyGroup>
 
 </Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,7 +61,7 @@ public static ushort ReadSequenceStart(Span<byte> data) @@
                 }
                 public static ushort ReadGameServerPort(Span<byte> data)
                 {
-                    return MemoryMarshal.Read<ushort>(data.Slice(10, 2));
+                    return ReadUInt16BigEndian(data.Slice(10, 2));
                 }
             }
         }
@@ Expand Down @@