Fix disabling send/receive timers after send/receive operations completed. (#5138)

Author: mconnew

src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/NetTcpBindingTests.4.0.0.cs

@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.ServiceModel;
+using System.Threading;
 using System.Threading.Tasks;
 using Infrastructure.Common;
 using Xunit;
@@ -79,4 +81,41 @@ public static async Task SecurityModeNone_Echo_RoundTrips_String_SyncAfterAsync(
             ScenarioTestHelpers.CloseCommunicationObjects((ICommunicationObject)serviceProxy, factory);
         }
     }
+
+    // Test for https://github.com/dotnet/wcf/issues/5134
+    [WcfFact]
+    [OuterLoop]
+    public static void ReceiveTimeout_Applied()
+    {
+        string testString = "Hello";
+        ChannelFactory<IWcfService> factory = null;
+        IWcfService serviceProxy = null;
+
+        try
+        {
+            // *** SETUP *** \\
+            NetTcpBinding binding = new NetTcpBinding(SecurityMode.None);
+            binding.OpenTimeout = TimeSpan.FromSeconds(10);
+            binding.SendTimeout = binding.ReceiveTimeout = TimeSpan.FromMinutes(10);
+            factory = new ChannelFactory<IWcfService>(binding, new EndpointAddress(Endpoints.Tcp_NoSecurity_Address));
+            serviceProxy = factory.CreateChannel();
+
+            // *** EXECUTE *** \\
+            ((IClientChannel)serviceProxy).Open();
+            Thread.Sleep(binding.OpenTimeout + TimeSpan.FromSeconds(5));
+            string result = serviceProxy.Echo(testString);
+
+            // *** VALIDATE *** \\
+            Assert.Equal(testString, result);
+
+            // *** CLEANUP *** \\
+            ((ICommunicationObject)serviceProxy).Close();
+            factory.Close();
+        }
+        finally
+        {
+            // *** ENSURE CLEANUP *** \\
+            ScenarioTestHelpers.CloseCommunicationObjects((ICommunicationObject)serviceProxy, factory);
+        }
+    }
 }

src/System.ServiceModel.NetTcp/src/System/ServiceModel/Channels/SocketConnection.cs

@@ -233,6 +233,7 @@ private async ValueTask<int> ReadCoreAsync(Memory<byte> buffer, TimeSpan timeout
             }
             finally
             {
+                CancelReceiveTimer();
                 // Restore the current ExecutionContext
                 if (restoreFlow)
                     ExecutionContext.RestoreFlow();
@@ -319,6 +320,7 @@ public async ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, bool immediate, T
             finally
             {
                 _asyncWritePending = false;
+                CancelSendTimer();
                 // Restore the current ExecutionContext
                 if (restoreFlow)
                     ExecutionContext.RestoreFlow();
@@ -635,13 +637,19 @@ private bool ShouldUpdateTimeout(DateTime oldTimeoutDeadline, TimeSpan newTimeou
         private static void OnReceiveTimeout(object state)
         {
             SocketConnection thisPtr = (SocketConnection)state;
-            thisPtr.Abort(SR.Format(SR.SocketAbortedReceiveTimedOut, thisPtr._asyncReceiveTimeout), TransferOperation.Read);
+            if (thisPtr._receiveTimerEnabled)
+            {
+                thisPtr.Abort(SR.Format(SR.SocketAbortedReceiveTimedOut, thisPtr._asyncReceiveTimeout), TransferOperation.Read);
+            }
         }
 
         private static void OnSendTimeout(object state)
         {
             SocketConnection thisPtr = (SocketConnection)state;
-            thisPtr.Abort(TraceEventType.Warning, SR.Format(SR.SocketAbortedSendTimedOut, thisPtr._asyncSendTimeout), TransferOperation.Write);
+            if (thisPtr._sendTimerEnabled)
+            {
+                thisPtr.Abort(TraceEventType.Warning, SR.Format(SR.SocketAbortedSendTimedOut, thisPtr._asyncSendTimeout), TransferOperation.Write);
+            }
         }
 
         private Exception ConvertObjectDisposedException(ObjectDisposedException originalException, TransferOperation transferOperation)