make report handling synchronous for now

Author: garethpotter

src/ThingSet.Common.Transports.Can/CanClientTransport.cs

@@ -132,7 +132,7 @@ private int ReadCanFdFrame(out uint canId, out byte length, out byte[] data)
         return read;
     }
 
-    protected override ValueTask HandleIncomingPublicationsAsync()
+    protected override void HandleIncomingPublications()
     {
         List<SocketCanException> exceptions = new List<SocketCanException>();
         try
@@ -166,7 +166,6 @@ protected override ValueTask HandleIncomingPublicationsAsync()
             }
             Thread.Sleep(ExceptionBackoffInterval);
         }
-        return ValueTask.CompletedTask;
     }
 
     private void NotifyControl(uint canId, ReadOnlyMemory<byte> body)

src/ThingSet.Common.Transports.Ip/IpClientTransport.cs

@@ -3,8 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-using System.Buffers;
-using System.Formats.Cbor;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading.Tasks;
@@ -68,16 +66,17 @@ protected override void Dispose(bool disposing)
         _udpClient.Dispose();
     }
 
-    protected async override ValueTask HandleIncomingPublicationsAsync()
+    protected override void HandleIncomingPublications()
     {
         try
         {
-            UdpReceiveResult data = await _udpClient.ReceiveAsync();
-            MessageType messageType = (MessageType)(data.Buffer[0] & 0xF0);
-            byte sequenceNumber = (byte)(data.Buffer[0] & 0x0F);
-            byte messageNumber = data.Buffer[1];
-            ReceiveBuffer receiveBuffer = GetOrCreateBuffer(data.RemoteEndPoint);
-            _reportParser.TryParse(sequenceNumber, messageNumber, messageType, receiveBuffer, data.Buffer, NotifyReport);
+            IPEndPoint? sender = null;
+            byte[] data = _udpClient.Receive(ref sender);
+            MessageType messageType = (MessageType)(data[0] & 0xF0);
+            byte sequenceNumber = (byte)(data[0] & 0x0F);
+            byte messageNumber = data[1];
+            ReceiveBuffer receiveBuffer = GetOrCreateBuffer(sender);
+            _reportParser.TryParse(sequenceNumber, messageNumber, messageType, receiveBuffer, data, NotifyReport);
         }
         catch (SocketException)
         {

src/ThingSet.Common/Transports/ClientTransportBase.cs

@@ -4,13 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 using System;
-using System.Buffers;
 using System.Collections.Concurrent;
-using System.Diagnostics.CodeAnalysis;
 using System.Formats.Cbor;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.VisualBasic;
 using ThingSet.Common.Protocols.Binary;
 
 namespace ThingSet.Common.Transports;
@@ -88,11 +85,11 @@ protected async void RunSubscriptionThread()
     {
         while (_runSubscriptionThread)
         {
-            await HandleIncomingPublicationsAsync();
+            HandleIncomingPublications();
         }
     }
 
-    protected abstract ValueTask HandleIncomingPublicationsAsync();
+    protected abstract void HandleIncomingPublications();
 
     protected ReceiveBuffer GetOrCreateBuffer(TEndpoint endpoint)
     {
@@ -140,23 +137,14 @@ public bool TryParse(byte sequenceNumber, byte messageNumber, TMessageType messa
             }
             if (IsLast(messageType))
             {
-                byte[] copy = ArrayPool<byte>.Shared.Rent(buffer.Position);
-                try
+                ReadOnlyMemory<byte> memory = buffer.Buffer;
+                CborReader reader = new CborReader(memory.Slice(1), CborConformanceMode.Lax, allowMultipleRootLevelValues: true);
+                ulong? eui = null;
+                if (buffer.Buffer[0] == (byte)ThingSetRequest.ReportEnhanced)
                 {
-                    buffer.CopyTo(copy);
-                    ReadOnlyMemory<byte> memory = copy;
-                    CborReader reader = new CborReader(memory.Slice(1), CborConformanceMode.Lax, allowMultipleRootLevelValues: true);
-                    ulong? eui = null;
-                    if (buffer.Buffer[0] == (byte)ThingSetRequest.ReportEnhanced)
-                    {
-                        eui = reader.ReadUInt64();
-                    }
-                    notifier(eui, reader);
-                }
-                finally
-                {
-                    ArrayPool<byte>.Shared.Return(copy);
+                    eui = reader.ReadUInt64();
                 }
+                notifier(eui, reader);
                 buffer.Reset();
                 return true;
             }
@@ -196,11 +184,5 @@ public void Append(Span<byte> source)
             source.CopyTo(destination.Slice(Position));
             Position += source.Length;
         }
-
-        public void CopyTo(Span<byte> target)
-        {
-            Span<byte> source = Buffer;
-            source.Slice(0, Position).CopyTo(target);
-        }
     }
 }