Clean up / Fixes.

juliusfriedman · Nov 22, 2023 · 8a97baf · 8a97baf
1 parent b9fbf5b
commit 8a97baf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Rtp/RtpClient.Methods.cs b/Rtp/RtpClient.Methods.cs
@@ -2652,7 +2652,7 @@ void SendReceieve()
                                     //}
                                 }
 
-                                if (Common.IDisposedExtensions.IsNullOrDisposed(sendContext) || Common.IDisposedExtensions.IsNullOrDisposed(sendContext.Goodbye) is false) goto Done;
+                                if (Common.IDisposedExtensions.IsNullOrDisposed(sendContext) || sendContext.Goodbye is not null) goto Done;
 
                                 //Send the packet using the context's SynchronizationSourceIdentifier
                                 if (SendRtpPacket(packet, sendContext, out lastError, sendContext.SynchronizationSourceIdentifier) >= packet.Length /* && lastError == SocketError.Success*/)

diff --git a/Rtsp/RtspClient.cs b/Rtsp/RtspClient.cs
@@ -3990,6 +3990,7 @@ public RtspMessage SendRtspMessage(RtspMessage message, out SocketError error, o
                     //TCP RST occurs when the ACK is missed so keep the window open.
                     if (IsConnected &&
                         SharesSocket is false &&
+                        m_RtspSocket.IsNullOrDisposed() is false &&
                         m_RtspSocket.Poll(m_SocketPollMicroseconds >> 4, SelectMode.SelectRead) /*&& m_RtspSocket.Available > 0*/)
                     {
                         //Receive if data is actually available.

diff --git a/UnitTests/Program.cs b/UnitTests/Program.cs
@@ -155,7 +155,7 @@ public static async Task Main(string[] args)
 
             RunTest(async () =>
             {
-                await RunTestAsync(TestServerAsync, nameof(TestServerAsync));
+                await RunTestAsync(TestServerAsync).ConfigureAwait(false);
             });
         }
 
@@ -4629,10 +4629,10 @@ static void RunTest(Action test, int count = 1, bool waitForGoAhead = true)
             System.Console.Clear();
             Console.WriteLine("About to run test: " + test.Method.Name);
             Console.WriteLine("Press Q to skip or any other key to continue.");
-            RunTestAsync(() => { test(); return Task.CompletedTask; }, test.Method.Name, count, waitForGoAhead).GetAwaiter().GetResult();
+            RunTestAsync(() => { test(); return Task.CompletedTask; }, count, waitForGoAhead).GetAwaiter().GetResult();
         }
 
-        static async Task RunTestAsync(Func<Task> test, string testMethodName, int count = 1, bool waitForGoAhead = true)
+        static async Task RunTestAsync(Func<Task> test, int count = 1, bool waitForGoAhead = true)
         {
             //If the debugger is attached get a ConsoleKey, the key is Q return.
             if (waitForGoAhead && /*System.Diagnostics.Debugger.IsAttached && */ Console.ReadKey(true).Key == ConsoleKey.Q) return;
@@ -4652,12 +4652,12 @@ static async Task RunTestAsync(Func<Task> test, string testMethodName, int count
                         //Decrement remaining
                         --remaining;
 
-                        TraceMessage("Beginning Test '" + testIndex + "'" + testMethodName);
+                        TraceMessage("Beginning Test '" + testIndex + "'");
 
                         //Run the test
                         await test().ConfigureAwait(false);
 
-                        TraceMessage("Completed Test'" + testIndex + "'" + testMethodName);
+                        TraceMessage("Completed Test'" + testIndex + "'");
 
                         //Increment the success counter
                         ++successes;
@@ -4706,7 +4706,7 @@ static async Task RunTestAsync(Func<Task> test, string testMethodName, int count
                 {
                     case ConsoleKey.W:
                         {
-                            await RunTestAsync(test, testMethodName, 1, false).ConfigureAwait(false);
+                            await RunTestAsync(test, 1, false).ConfigureAwait(false);
                             return;
                         }
                     case ConsoleKey.D: