Dispose socket on ConnectFailureException

Fixes #337.

Author: michaelklishin

projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj

@@ -61,6 +61,7 @@
     <PackageReference Include="System.Net.Sockets" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
+    <PackageReference Include="System.Runtime" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />
     <PackageReference Include="System.Threading" Version="4.3.0" />

projects/client/RabbitMQ.Client/src/client/api/ITcpClient.cs

@@ -10,7 +10,7 @@ namespace RabbitMQ.Client
     /// Wrapper interface for standard TCP-client. Provides socket for socket frame handler class.
     /// </summary>
     /// <remarks>Contains all methods that are currenty in use in rabbitmq client.</remarks>
-    public interface ITcpClient
+    public interface ITcpClient : IDisposable
     {
         bool Connected { get; }
 

projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler.cs

@@ -257,7 +257,7 @@ public void Flush()
 
         private bool ShouldTryIPV6(AmqpTcpEndpoint endpoint)
         {
-            return (Socket.OSSupportsIPv6 && endpoint.AddressFamily != AddressFamily.InterNetwork)
+            return (Socket.OSSupportsIPv6 && endpoint.AddressFamily != AddressFamily.InterNetwork);
         }
 
         private ITcpClient ConnectUsingIPv6(AmqpTcpEndpoint endpoint,
@@ -278,9 +278,14 @@ private ITcpClient ConnectUsingAddressFamily(AmqpTcpEndpoint endpoint,
                                                     Func<AddressFamily, ITcpClient> socketFactory,
                                                     int timeout, AddressFamily family)
         {
-            var socket = socketFactory(family);
-            ConnectOrFail(socket, endpoint, timeout);
-            return socket;
+            ITcpClient socket = socketFactory(family);
+            try {
+                ConnectOrFail(socket, endpoint, timeout);
+                return socket;
+            } catch (ConnectFailureException e) {
+                socket.Dispose();
+                throw e;
+            }
         }
 
         private void ConnectOrFail(ITcpClient socket, AmqpTcpEndpoint endpoint, int timeout)

projects/client/RabbitMQ.Client/src/client/impl/TcpClientAdapter.cs

@@ -41,8 +41,16 @@ public virtual async Task ConnectAsync(string host, int port)
 
         public virtual void Close()
         {
-            if(sock != null)
+            // TODO: Socket.Close() would be a better option here. MK.
+            this.Dispose();
+        }
+
+        public virtual void Dispose()
+        {
+            if (sock != null)
+            {
                 sock.Dispose();
+            }
             sock = null;
         }