Performance and bugfixes used by Borg

Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
- <PropertyGroup Condition=" '$(Framework)' != 'NET461'">
-   <LangVersion>8.0</LangVersion>
+ <PropertyGroup>
+   <LangVersion>12.0</LangVersion>
  </PropertyGroup>
 </Project>

examples/WebRTCScenarios/DataChannelBandwidth/BandwidthTestProgram.cs

@@ -135,4 +135,4 @@ void SendRecv(RTCDataChannel channel, ref long received,
     {
         Interlocked.Add(ref received, stream.Read(buffer));
     }
-}
+}

examples/WebRTCScenarios/DataChannelBandwidth/DataChannelBandwidth.csproj

@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <LangVersion>12</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 

examples/WebRTCScenarios/DataChannelBandwidth/DataChannelStream.cs

@@ -10,7 +10,7 @@ class DataChannelStream : Stream
 {
     readonly RTCDataChannel channel;
     int currentMessageOffset;
-    byte[] message = [];
+    ArraySegment<byte> message = Array.Empty<byte>();
     readonly CancellationTokenSource closed = new();
     readonly SemaphoreSlim messageNeeded = new(0, 1);
     readonly SemaphoreSlim messageAvailable = new(0, maxCount: 1);
@@ -75,7 +75,7 @@ or RTCPeerConnectionState.disconnected
     }
 
     int messages;
-    void OnMessage(RTCDataChannel _, DataChannelPayloadProtocols protocol, byte[] data)
+    void OnMessage(RTCDataChannel _, DataChannelPayloadProtocols protocol, ReadOnlySpan<byte> data)
     {
         int seq = Interlocked.Increment(ref messages);
         log?.LogDebug("{Seq} received", seq);
@@ -84,7 +84,11 @@ void OnMessage(RTCDataChannel _, DataChannelPayloadProtocols protocol, byte[] da
             messageNeeded.Wait();
             lock (sync)
             {
-                message = data;
+                if (message.Array is not null)
+                {
+                    ArrayPool<byte>.Shared.Return(message.Array);
+                }
+                message = data.ToArraySegment(ArrayPool<byte>.Shared);
                 currentMessageOffset = 0;
             }
             messageAvailable.Release();
@@ -139,7 +143,7 @@ public override int Read(Span<byte> buffer)
 
             lock (sync)
             {
-                int remaining = message.Length - currentMessageOffset;
+                int remaining = message.Count - currentMessageOffset;
                 int toCopy = Math.Min(remaining, buffer.Length);
                 message.AsSpan(currentMessageOffset, toCopy).CopyTo(buffer);
                 currentMessageOffset += toCopy;
@@ -193,7 +197,7 @@ public override async ValueTask<int> ReadAsync(Memory<byte> buffer,
 
             lock (sync)
             {
-                int remaining = message.Length - currentMessageOffset;
+                int remaining = message.Count - currentMessageOffset;
                 int toCopy = Math.Min(remaining, buffer.Length);
                 message.AsSpan(currentMessageOffset, toCopy).CopyTo(buffer.Span);
                 currentMessageOffset += toCopy;
@@ -208,7 +212,7 @@ public override async ValueTask<int> ReadAsync(Memory<byte> buffer,
     }
     long totalRead;
 
-    bool MessageNeeded() => message.Length - currentMessageOffset == 0;
+    bool MessageNeeded() => message.Count - currentMessageOffset == 0;
 
     public override void Write(byte[] buffer, int offset, int count)
     {
@@ -235,13 +239,13 @@ public override async ValueTask WriteAsync(ReadOnlyMemory<byte> buffer,
             {
                 cancellationToken.ThrowIfCancellationRequested();
                 var packet = buffer[..MaxSendBytes];
-                await Task.Run(() => Send(packet.Span.ToArray()), cancellationToken)
+                await Task.Run(() => Send(packet.Span), cancellationToken)
                           .ConfigureAwait(false);
                 buffer = buffer[MaxSendBytes..];
             }
             cancellationToken.ThrowIfCancellationRequested();
             if (buffer.Length > 0)
-                Send(buffer.Span.ToArray());
+                Send(buffer.Span);
         }
         finally
         {
@@ -250,7 +254,7 @@ await Task.Run(() => Send(packet.Span.ToArray()), cancellationToken)
     }
 
     long totalSent;
-    void Send(byte[] buffer)
+    void Send(ReadOnlySpan<byte> buffer)
     {
         channel.send(buffer);
         Interlocked.Add(ref totalSent, buffer.Length);
@@ -264,11 +268,11 @@ public override void Write(ReadOnlySpan<byte> buffer)
             while (buffer.Length > MaxSendBytes)
             {
                 var packet = buffer[..MaxSendBytes];
-                Send(packet.ToArray());
+                Send(packet);
                 buffer = buffer[MaxSendBytes..];
             }
             if (buffer.Length > 0)
-                Send(buffer.ToArray());
+                Send(buffer);
         }
         finally
         {

examples/WebRTCScenarios/DataChannelBandwidth/SpanExtensions.cs

@@ -0,0 +1,13 @@
+using System.Buffers;
+
+namespace DataChannelBandwidth;
+
+static class SpanExtensions
+{
+    public static ArraySegment<T> ToArraySegment<T>(this ReadOnlySpan<T> span, ArrayPool<T> pool)
+    {
+        var result = pool.Rent(span.Length);
+        span.CopyTo(result);
+        return new ArraySegment<T>(result, 0, span.Length);
+    }
+}

src/SIPSorcery.csproj

@@ -17,16 +17,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
     <PackageReference Include="DnsClient" Version="1.7.0" />
     <PackageReference Include="SIPSorcery.WebSocketSharp" Version="0.0.1" />
     <PackageReference Include="SIPSorceryMedia.Abstractions" Version="1.2.1" />
+    <PackageReference Include="Small" Version="0.0.2" />
     <PackageReference Include="System.Net.WebSockets.Client" Version="4.3.2" />
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net461;net5.0;net6.0;net8.0</TargetFrameworks>
-    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+    <TargetFrameworks>netstandard2.0;net461;net6.0;net8.0</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);SYSLIB0050</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <!-- Disable warning for missing XML doc comments. -->
@@ -41,7 +42,6 @@
     <Company>SIP Sorcery PTY LTD</Company>
     <Product>SIPSorcery</Product>
     <PackageId>SIPSorcery</PackageId>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageProjectUrl>https://sipsorcery-org.github.io/sipsorcery/</PackageProjectUrl>
     <PackageIconUrl>http://www.sipsorcery.com/mainsite/favicon.ico</PackageIconUrl>
     <PackageIcon>icon.png</PackageIcon>
@@ -50,6 +50,7 @@
     <RepositoryBranch>master</RepositoryBranch>
     <PackageTags>SIP WebRTC VoIP RTP SDP STUN ICE SIPSorcery</PackageTags>
     <PackageReleaseNotes>-v8.0.0: RTP header extension improvements (thanks to @ChristopheI). Major version to 8 to reflect highest .net runtime supported.
+-v7.0.0: upgraded BouncyCastle to v2. Set minimal supported DTLS to 1.2, and enabled 1.3.
 -v6.2.4: WebRTC fix for DTLS change in Chrome v124.
 -v6.2.3: Bug fixes.
 -v6.2.1: Bug fixes.
@@ -67,9 +68,9 @@
 -v6.0.2: Set .net6 targetted version as stable.
 -v6.0.1-pre: Added .net6 target.</PackageReleaseNotes>
     <NeutralLanguage>en</NeutralLanguage>
-    <Version>8.0.0</Version>
-    <AssemblyVersion>8.0.0</AssemblyVersion>
-    <FileVersion>8.0.0</FileVersion>
+    <Version>9.0.0-PacketView-24.7.10.0</Version>
+    <AssemblyVersion>9.0.0</AssemblyVersion>
+    <FileVersion>9.0.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="SourceLink">
@@ -80,8 +81,8 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
 
     <!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
+    <DebugType>Embedded</DebugType>
     <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <ContinuousIntegrationBuild Condition="'$(CI)' == 'true'">true</ContinuousIntegrationBuild>
   </PropertyGroup>