Update SharPcap to 6.3.1 and project to .NET 8

.github/workflows/buildAndPublish.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 8.0.x
       - name: Restore dependencies
         run: dotnet restore
       - name: Build

FauCap/Converter.cs

@@ -47,12 +47,13 @@ public List<GameSession> PcapFileToFaucap(string InFile)
             return Sessions;
         }
 
-        void OnPacketArrival(object sender, CaptureEventArgs e)
+        void OnPacketArrival(object sender, PacketCapture e)
         {
-            if (e.Packet.LinkLayerType == PacketDotNet.LinkLayers.Ethernet || e.Packet.LinkLayerType == PacketDotNet.LinkLayers.Null)
+            var linkLayerType = ((ICaptureDevice)sender).LinkType;
+            if (linkLayerType == PacketDotNet.LinkLayers.Ethernet || linkLayerType == PacketDotNet.LinkLayers.Null)
             {
 
-                var packet = PacketDotNet.Packet.ParsePacket(e.Packet.LinkLayerType, e.Packet.Data);
+                var packet = PacketDotNet.Packet.ParsePacket(linkLayerType, e.Data.ToArray());
 
                 var udpPacket = (PacketDotNet.UdpPacket)packet.Extract<PacketDotNet.UdpPacket>();
 
@@ -61,7 +62,7 @@ void OnPacketArrival(object sender, CaptureEventArgs e)
                 if (udpPacket == null) { return; }
                 byte[] data = udpPacket.PayloadData;
 
-                DateTime time = e.Packet.Timeval.Date;
+                DateTime time = e.Header.Timeval.Date;
                 if (IsHandshakePacket(data))
                 {
                     switch (Handshake.ReadName(data))

FauCap/FauCap.csproj

@@ -2,21 +2,21 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Authors>freakbyte</Authors>
     <Company>TheMeldingWars</Company>
     <RepositoryUrl>https://github.com/themeldingwars/FauCap</RepositoryUrl>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <Product>FauCap</Product>
-    <Version>1.12.0.0</Version>
-    <AssemblyVersion>1.14.0.0</AssemblyVersion>
+    <Version>1.15.0.0</Version>
+    <AssemblyVersion>1.15.0.0</AssemblyVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageVersion>1.14.0.0</PackageVersion>
+    <PackageVersion>1.15.0.0</PackageVersion>
   </PropertyGroup>
 
 
   <ItemGroup>
-    <PackageReference Include="SharpPcap" Version="5.4.0" />
+    <PackageReference Include="SharpPcap" Version="6.3.1" />
   </ItemGroup>
 
 

FauCap/PacketUtil.cs

@@ -8,7 +8,7 @@ namespace FauCap
 {
     static class PacketUtil
     {
-        public static bool IsControlPacket(Span<byte> data)
+        public static bool IsControlPacket(ReadOnlySpan<byte> data)
         {
             if (data.Length >= 4)
             {
@@ -17,7 +17,7 @@ public static bool IsControlPacket(Span<byte> data)
             return false;
         }
 
-        public static bool IsHandshakePacket(Span<byte> data)
+        public static bool IsHandshakePacket(ReadOnlySpan<byte> data)
         {
             if (data.Length > 8)
             {
@@ -39,27 +39,27 @@ public static bool IsHandshakePacket(Span<byte> data)
 
         public static class Handshake
         {
-            public static string ReadName(Span<byte> data)
+            public static string ReadName(ReadOnlySpan<byte> data)
             {
                 return Encoding.ASCII.GetString(data.Slice(4, 4));
             }
-            public static uint ReadProtocolVersion(Span<byte> data)
+            public static uint ReadProtocolVersion(ReadOnlySpan<byte> data)
             {
                 return MemoryMarshal.Read<uint>(data.Slice(8, 4));
             }
-            public static uint ReadSocketId(Span<byte> data)
+            public static uint ReadSocketId(ReadOnlySpan<byte> data)
             {
                 return MemoryMarshal.Read<uint>(data.Slice(8, 4));
             }
-            public static ushort ReadStreamingProtocol(Span<byte> data)
+            public static ushort ReadStreamingProtocol(ReadOnlySpan<byte> data)
             {
                 return MemoryMarshal.Read<ushort>(data.Slice(12, 2));
             }
-            public static ushort ReadSequenceStart(Span<byte> data)
+            public static ushort ReadSequenceStart(ReadOnlySpan<byte> data)
             {
                 return ReadUInt16BigEndian(data.Slice(8, 2));
             }
-            public static ushort ReadGameServerPort(Span<byte> data)
+            public static ushort ReadGameServerPort(ReadOnlySpan<byte> data)
             {
                 return ReadUInt16BigEndian(data.Slice(10, 2));
             }

FauCapParser/FauCapParser.csproj

@@ -3,12 +3,12 @@
   <PropertyGroup>
     <RepositoryUrl>https://github.com/themeldingwars/FauCap</RepositoryUrl>
     <LangVersion>9</LangVersion>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Company>TheMeldingWars</Company>
-    <AssemblyVersion>1.14.0.0</AssemblyVersion>
-    <Version>1.12.0.0</Version>
-    <PackageVersion>1.14.0.0</PackageVersion>
+    <AssemblyVersion>1.15.0.0</AssemblyVersion>
+    <Version>1.15.0.0</Version>
+    <PackageVersion>1.15.0.0</PackageVersion>
   </PropertyGroup>
 
 </Project>

Test/Test.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="SharpPcap" Version="5.4.0" />
+      <PackageReference Include="SharpPcap" Version="6.3.1" />
     </ItemGroup>
 
 </Project>

publish.bat

@@ -1,11 +1,11 @@
 dotnet clean
 dotnet restore
 dotnet build -c release
-dotnet publish -c release -r win7-x64 -o FauCap/bin/dist/win-x64 --self-contained false
+dotnet publish -c release -r win-x64 -o FauCap/bin/dist/win-x64 --self-contained false
 dotnet publish -c release -r linux-x64 -o FauCap/bin/dist/linux-x64 --self-contained false
 dotnet publish -c release -r osx-x64 -o FauCap/bin/dist/osx-x64 --self-contained false
 
 REM publish the package to github nuget
 dotnet pack --configuration Release
-dotnet nuget push "FauCap/bin/Release/FauCap.1.1.0.nupkg" --source "tmw"
-dotnet nuget push "FauCapParser/bin/Release/FauCapParser.1.0.0.nupkg" --source "tmw"
+dotnet nuget push "FauCap/bin/Release/FauCap.1.15.0.0.nupkg" --source "tmw"
+dotnet nuget push "FauCapParser/bin/Release/FauCapParser.1.15.0.0.nupkg" --source "tmw"