eventphone · zivillian · Apr 20, 2025 · Apr 18, 2025 · Apr 18, 2025 · Apr 19, 2025
diff --git a/.github/workflows/dotnet-publish.yml b/.github/workflows/dotnet-publish.yml
@@ -7,7 +7,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0'
+        dotnet-version: '8.0'
     - run: 'dotnet restore'
     - run: 'dotnet publish -o publish/rfpproxy -c Release RfpProxy/RfpProxy.csproj'
     - run: 'dotnet publish -o publish/rfpproxy.log -c Release RfpProxy.Log/RfpProxy.Log.csproj'

diff --git a/AVM.Test/AVM.Test.csproj b/AVM.Test/AVM.Test.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/AVM/AVM.csproj b/AVM/AVM.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>avm</AssemblyName>
     <RootNamespace>RfpProxy.AVM</RootNamespace>
   </PropertyGroup>

diff --git a/BusyLed/BusyLed.csproj b/BusyLed/BusyLed.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>busyled</AssemblyName>
     <RootNamespace>RfpProxy.BusyLed</RootNamespace>
   </PropertyGroup>

diff --git a/CompressIPUI/CompressIPUI.csproj b/CompressIPUI/CompressIPUI.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>compressipui</AssemblyName>
     <RootNamespace>RfpProxy.CompressIPUI</RootNamespace>
   </PropertyGroup>

diff --git a/DoS/DoS.csproj b/DoS/DoS.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>dos</AssemblyName>
     <RootNamespace>RfpProxy.Dos</RootNamespace>
   </PropertyGroup>

diff --git a/MediaTone.Test/MediaTone.Test.csproj b/MediaTone.Test/MediaTone.Test.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/MediaTone/MediaTone.csproj b/MediaTone/MediaTone.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>mediatone</AssemblyName>
     <RootNamespace>RfpProxy.MediaTone</RootNamespace>
   </PropertyGroup>
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Melanchall.DryWetMidi.Nativeless" Version="6.1.3" />
+    <PackageReference Include="Melanchall.DryWetMidi.Nativeless" Version="6.1.4" />
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
   </ItemGroup>
 

diff --git a/MorseLed/MorseLed.csproj b/MorseLed/MorseLed.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>morseled</AssemblyName>
     <RootNamespace>RfpProxy.MorseLed</RootNamespace>
   </PropertyGroup>

diff --git a/RfpProxy.AaMiDe/AaMiDe/Sys/SysInitMessage.cs b/RfpProxy.AaMiDe/AaMiDe/Sys/SysInitMessage.cs
@@ -224,9 +224,9 @@ public SysInitMessage(PhysicalAddress mac, RfpCapabilities capabilities) : base(
             Hardware = RfpType.RFP35;
             Mac2 = mac;
             Magic = 0x00037a20000529d9;
-            Protocol = 0x080303u;
+            Protocol = 0x080500u;
             Capabilities = capabilities;
-            SwVersion = "SIP-DECT 8.3-eventphone";
+            SwVersion = "SIP-DECT 9.2-eventphone";
         }
 
         public SysInitMessage(ReadOnlyMemory<byte> data):base(MsgType.SYS_INIT, data)
@@ -362,4 +362,4 @@ public override void Log(TextWriter writer)
             writer.Write($"SW Version({SwVersion}) Signature({Signature.ToHex()}) ");
         }
     }
-}
+}
diff --git a/RfpProxy.ChangeLed/RfpProxy.ChangeLed.csproj b/RfpProxy.ChangeLed/RfpProxy.ChangeLed.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/RfpProxy.Inject/RfpProxy.Inject.csproj b/RfpProxy.Inject/RfpProxy.Inject.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>rfpproxyinject</AssemblyName>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />

diff --git a/RfpProxy.Log/RfpProxy.Log.csproj b/RfpProxy.Log/RfpProxy.Log.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>rfpproxylog</AssemblyName>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/RfpProxy.Pcap/RfpProxy.Pcap.csproj b/RfpProxy.Pcap/RfpProxy.Pcap.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>rfpproxydump</AssemblyName>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />

diff --git a/RfpProxy.Test/RfpProxy.Test.csproj b/RfpProxy.Test/RfpProxy.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -18,9 +18,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/RfpProxy.Traffic/RfpProxy.Traffic.csproj b/RfpProxy.Traffic/RfpProxy.Traffic.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>rfpproxytraffic</AssemblyName>
   </PropertyGroup>
 

diff --git a/RfpProxy/AbstractRfpProxy.cs b/RfpProxy/AbstractRfpProxy.cs
@@ -21,7 +21,7 @@ public AbstractRfpProxy(int listenPort, string ommHost, int ommPort)
         protected override async Task ReadFromClientAsync(CryptedRfpConnection connection, PipeReader client, CancellationToken cancellationToken)
         {
             var sysInit = await ReadPacketAsync(0x0120, 0, client, cancellationToken).ConfigureAwait(false);
-
+            Console.WriteLine($"[{connection.TraceId}] SYS_INIT");
             var iv = connection.RfpToOmmIv;
             connection.RfpToOmmIv = ReadOnlyMemory<byte>.Empty;
 
@@ -37,6 +37,7 @@ protected override async Task ReadFromClientAsync(CryptedRfpConnection connectio
         protected override async Task ReadFromServerAsync(CryptedRfpConnection connection, PipeReader server, CancellationToken cancellationToken)
         {
             var sysAuthenticate = await ReadPacketAsync(0x012d, 0x20, server, cancellationToken).ConfigureAwait(false);
+            Console.WriteLine($"[{connection.TraceId}] SYS_AUTHENTICATE");
             connection.InitRfpToOmmIv(sysAuthenticate.Slice(11, 8).Span);
 
             await OnServerMessageAsync(connection, sysAuthenticate, cancellationToken).ConfigureAwait(false);
@@ -49,11 +50,13 @@ protected override async Task ReadFromServerAsync(CryptedRfpConnection connectio
                 if (type.Span[1] == 0x24)
                 {
                     //SYS_RFP_AUTH_KEY
+                    Console.WriteLine($"[{connection.TraceId}] SYS_RFP_AUTH_KEY");
                     key = packet.Slice(4);
                 }
                 else if (type.Span[1] == 0x25)
                 {
                     //SYS_RFP_RE_ENROLEMENT
+                    Console.WriteLine($"[{connection.TraceId}] SYS_RFP_RE_ENROLEMENT");
                     var checksum = packet.Slice(0x44);
                     var crypted = packet.Slice(4, 0x40);
                     var pw = await GetRootPasswordHashAsync(cancellationToken).ConfigureAwait(false);
@@ -94,9 +97,28 @@ protected override async Task ReadFromServerAsync(CryptedRfpConnection connectio
                 await OnServerMessageAsync(connection, packet, cancellationToken).ConfigureAwait(false);
                 packet = await ReadPacketAsync(0x01, 0x08, server, cancellationToken).ConfigureAwait(false);
             }
+            else
+            {
+                Console.WriteLine($"[{connection.TraceId}] PACKET 0x{type.Span[0]:X2}{type.Span[1]:X2}");
+            }
             var ack = packet;
             await OnServerMessageAsync(connection, ack, cancellationToken).ConfigureAwait(false);
 
+            //check if we have another unencrypted SYS_OMM_CONTROL
+            //this may happen if the RFP requires a firmware update
+            var next = await server.ReadAsync(cancellationToken).ConfigureAwait(false);
+            server.AdvanceTo(next.Buffer.Start, next.Buffer.Start); 
+            if (next.Buffer.Length > 2 && next.Buffer.FirstSpan[0] == 0x01 && next.Buffer.Slice(1).FirstSpan[0] == 0x0c)
+            {
+                packet = await ReadPacketAsync(0x010c, 0, server, cancellationToken).ConfigureAwait(false);
+                Console.WriteLine($"[{connection.TraceId}] SYS_OMM_CONTROL");
+                await OnServerMessageAsync(connection, packet, cancellationToken).ConfigureAwait(false);
+
+                packet = await ReadPacketAsync(0x0121, 0, server, cancellationToken).ConfigureAwait(false);
+                Console.WriteLine($"[{connection.TraceId}] SYS_RESET");
+                await OnServerMessageAsync(connection, packet, cancellationToken).ConfigureAwait(false);
+            }           
+
             connection.InitOmmToRfpIv(sysAuthenticate.Slice(27, 8).Span);
 
             await ReadAsync(connection, server, OnServerMessageAsync, connection.OmmToRfpIv, connection.DecryptOmmToRfp, cancellationToken).ConfigureAwait(false);
@@ -146,7 +168,7 @@ private static async Task ReadAsync(CryptedRfpConnection connection, PipeReader
             }
             catch (OperationCanceledException ex)
             {
-                Console.WriteLine("cancelled in AbstractRfpProxy.ReadAsync");
+                Console.WriteLine($"[{connection.TraceId}] cancelled in AbstractRfpProxy.ReadAsync");
                 reader.Complete(ex);
             }
         }

diff --git a/RfpProxy/RfpConnection.cs b/RfpProxy/RfpConnection.cs
@@ -18,6 +18,7 @@ public RfpConnection(TcpClient client, TcpClient server)
         }
 
         public RfpIdentifier Identifier { get; set; }
+        public Guid TraceId { get; } = Guid.NewGuid();
 
         public virtual ValueTask<int> SendToServerAsync(ReadOnlyMemory<byte> data, CancellationToken cancellationToken)
         {
@@ -30,5 +31,10 @@ public virtual ValueTask<int> SendToClientAsync(ReadOnlyMemory<byte> data, Cance
             if (data.IsEmpty) return new ValueTask<int>(0);
             return Client.Client.SendAsync(data, SocketFlags.None, cancellationToken);
         }
+
+        public override string ToString()
+        {
+            return TraceId.ToString();
+        }
     }
 }
diff --git a/RfpProxy/RfpProxy.csproj b/RfpProxy/RfpProxy.csproj
@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>rfpproxy</AssemblyName>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="System.IO.Pipelines" Version="6.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/RfpProxy/TcpProxy.cs b/RfpProxy/TcpProxy.cs
@@ -95,28 +95,43 @@ private async Task HandleClientAsync(TcpClient client, CancellationToken cancell
                 {
                     await server.ConnectAsync(_server, _port, cts.Token).ConfigureAwait(false);
                     var clientData = OnClientConnected(client, server);
+                    var tasks = new List<Task>();
                     try
                     {
                         var clientPipe = new Pipe();
                         var fillClientPipe = PipeHelper.FillPipeAsync(client.Client, clientPipe.Writer, cts.Token);
+                        tasks.Add(fillClientPipe);
                         var readClientPipe = ReadFromClientAsync(clientData, clientPipe.Reader, cts.Token);
+                        tasks.Add(readClientPipe);
 
                         var serverPipe = new Pipe();
                         var fillServerPipe = PipeHelper.FillPipeAsync(server.Client, serverPipe.Writer, cts.Token);
+                        tasks.Add(fillServerPipe);
                         var readServerPipe = ReadFromServerAsync(clientData, serverPipe.Reader, cts.Token);
-
-                        var t = await Task.WhenAny(fillClientPipe, readClientPipe, fillServerPipe, readServerPipe).ConfigureAwait(false);
+                        tasks.Add(readServerPipe);
+                        var t = await Task.WhenAny(tasks).ConfigureAwait(false);
                         await t;
                     }
                     catch (Exception ex)
                     {
-                        Console.WriteLine("HandleClient failed");
-                        Console.WriteLine(ex);
+                        Console.WriteLine($"[{clientData}] HandleClient failed\n{ex}");
                     }
                     finally
                     {
-                        cts.Cancel();
-                        OnClientDisconnected(clientData);
+                        //delay cancellation to allow processing of pending packets
+                        cts.CancelAfter(100);
+                        try
+                        {
+                            await Task.WhenAll(tasks);
+                        }
+                        catch(Exception ex)
+                        {
+                            Console.WriteLine($"[{clientData}] Exception during teardown\n{ex}");
+                        }
+                        finally
+                        {
+                            OnClientDisconnected(clientData);
+                        }                        
                     }
                 }
         }

diff --git a/RfpProxyLib/RfpProxyLib.csproj b/RfpProxyLib/RfpProxyLib.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>
diff --git a/SoftRfp/SoftRfp.csproj b/SoftRfp/SoftRfp.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>virtualrfp</AssemblyName>
     <RootNamespace>RfpProxy.Virtual</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
-    <PackageReference Include="System.IO.Pipelines" Version="6.0.3" />
+    <PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>