Remove device ID from XboxDevice and re-handle arrival message

Author: TheNathannator

Program/PacketParsing/Backends/PcapBackend.cs

@@ -137,7 +137,7 @@ private static unsafe void OnPacketArrival(object sender, PacketCapture packet)
             ulong deviceId = header.DeviceId;
             if (!devices.TryGetValue(deviceId, out var device))
             {
-                device = new XboxDevice(deviceId);
+                device = new XboxDevice();
                 devices.Add(deviceId, device);
                 Console.WriteLine($"Device with ID {deviceId:X12} was connected");
             }

Program/PacketParsing/Packets/DeviceArrival.cs

@@ -0,0 +1,14 @@
+using System.Runtime.InteropServices;
+
+namespace RB4InstrumentMapper.Parsing
+{
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    internal readonly struct DeviceArrival
+    {
+        public readonly ulong SerialNumber;
+        public readonly ushort VendorId;
+        public readonly ushort ProductId;
+        private readonly ulong ignored1;
+        private readonly ulong ignored2;
+    }
+}

Program/PacketParsing/XboxClient.cs

@@ -68,11 +68,13 @@ internal unsafe XboxResult HandleMessage(CommandHeader header, ReadOnlySpan<byte
             {
                 // Commands to ignore
                 case CommandId.Acknowledgement:
-                case CommandId.Arrival:
                 case CommandId.Authentication:
                 case CommandId.SerialNumber:
                     break;
 
+                case CommandId.Arrival:
+                    return HandleArrival(commandData);
+
                 case CommandId.Status:
                     return HandleStatus(commandData);
 
@@ -162,6 +164,18 @@ private unsafe XboxResult ProcessPacketChunk(CommandHeader header, ref ReadOnlyS
             return XboxResult.Pending;
         }
 
+        /// <summary>
+        /// Handles the arrival message of the device.
+        /// </summary>
+        private unsafe XboxResult HandleArrival(ReadOnlySpan<byte> data)
+        {
+            if (data.Length < sizeof(DeviceArrival) || MemoryMarshal.TryRead(data, out DeviceArrival arrival))
+                return XboxResult.InvalidMessage;
+
+            Console.WriteLine($"New client connected with ID {arrival.SerialNumber:X12}");
+            return XboxResult.Success;
+        }
+
         /// <summary>
         /// Handles the arrival message of the device.
         /// </summary>

Program/PacketParsing/XboxDevice.cs

@@ -24,18 +24,11 @@ public class XboxDevice : IDisposable
     {
         public static MappingMode MapperMode;
 
-        public ulong DeviceId { get; }
-
         /// <summary>
         /// The clients currently on the device.
         /// </summary>
         private readonly Dictionary<int, XboxClient> clients = new Dictionary<int, XboxClient>();
 
-        public XboxDevice(ulong deviceId)
-        {
-            DeviceId = deviceId;
-        }
-
         ~XboxDevice()
         {
             Dispose(false);
@@ -71,7 +64,6 @@ public unsafe XboxResult HandlePacket(ReadOnlySpan<byte> data)
                 {
                     client = new XboxClient();
                     clients.Add(header.Client, client);
-                    Console.WriteLine($"Client {header.Client} connected on device with ID {DeviceId:X12}");
                 }
                 var clientResult = client.HandleMessage(header, commandData);
                 switch (clientResult)

Program/RB4InstrumentMapper.csproj

@@ -122,6 +122,7 @@
     <Compile Include="PacketParsing\Mappers\VigemMapper.cs" />
     <Compile Include="PacketParsing\Mappers\VjoyMapper.cs" />
     <Compile Include="PacketParsing\Packets\CommandHeader.cs" />
+    <Compile Include="PacketParsing\Packets\DeviceArrival.cs" />
     <Compile Include="PacketParsing\Packets\DeviceStatus.cs" />
     <Compile Include="PacketParsing\Packets\DrumInput.cs" />
     <Compile Include="PacketParsing\Packets\GamepadInput.cs" />