Resolved unhandled exception in UDP receive.

NTDLS · Dec 22, 2023 · 2ddfadf · 2ddfadf
1 parent d7308c7
commit 2ddfadf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/NTDLS.UDPPacketFraming/FrameBuffer.cs b/NTDLS.UDPPacketFraming/FrameBuffer.cs
@@ -48,7 +48,18 @@ internal bool ReadData(UdpClient udpClient, ref IPEndPoint endPoint)
         {
             try
             {
-                ReceiveBuffer = udpClient.Receive(ref endPoint);
+                try
+                {
+                    ReceiveBuffer = udpClient.Receive(ref endPoint);
+                }
+                catch (SocketException ex)
+                {
+                    if (ex.SocketErrorCode != SocketError.Interrupted)
+                    {
+                        throw;
+                    }
+                    return false; //Graceful disconnect.
+                }
                 ReceiveBufferUsed = ReceiveBuffer.Length;
 
                 if (ReceiveBufferUsed == 0)

diff --git a/NTDLS.UDPPacketFraming/UdpMessageManager.cs b/NTDLS.UDPPacketFraming/UdpMessageManager.cs
@@ -12,7 +12,7 @@ namespace NTDLS.UDPPacketFraming
     /// </summary>
     public class UdpMessageManager
     {
-        private static Random _random = new Random();
+        private static readonly Random _random = new();
         private bool _keepRunning = false;
         private Thread? _receiveThread = null;
 
@@ -195,9 +195,15 @@ private void ListenAsync(int listenPort, ProcessFrameNotificationCallback proces
 
             _receiveThread = new Thread(o =>
             {
-                while (_keepRunning && Client.ReadAndProcessFrames(ref clientEndPoint, frameBuffer, processNotificationCallback))
+                while (_keepRunning)
                 {
-                    Thread.Sleep(0);
+                    try
+                    {
+                        while (Client.ReadAndProcessFrames(ref clientEndPoint, frameBuffer, processNotificationCallback))
+                        {
+                        }
+                    }
+                    catch { }
                 }
             });