Wrap standard .net tcp client with interface so that ConnectionFactoryBase.DefaultSocketFactory can be overriden to return an extended tcp client.

Author: itm456

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

@@ -146,6 +146,7 @@
     <Compile Include="src\client\api\IQueueingBasicConsumer.cs" />
     <Compile Include="src\client\api\IRecoverable.cs" />
     <Compile Include="src\client\api\IStreamProperties.cs" />
+    <Compile Include="src\client\api\ITcpClient.cs" />
     <Compile Include="src\client\api\NetworkConnection.cs" />
     <Compile Include="src\client\api\PlainMechanism.cs" />
     <Compile Include="src\client\api\PlainMechanismFactory.cs" />
@@ -252,6 +253,7 @@
     <Compile Include="src\client\impl\SoftProtocolException.cs" />
     <Compile Include="src\client\impl\StreamProperties.cs" />
     <Compile Include="src\client\impl\SyntaxError.cs" />
+    <Compile Include="src\client\impl\TcpClientAdapter.cs" />
     <Compile Include="src\client\impl\UnexpectedFrameException.cs" />
     <Compile Include="src\client\impl\UnknownClassOrMethodException.cs" />
     <Compile Include="src\client\impl\WireFormatting.cs" />

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

@@ -56,7 +56,7 @@ public class ConnectionFactoryBase
 #if NETFX_CORE
         public Func<StreamSocket> SocketFactory = DefaultSocketFactory;
 #else
-        public Func<AddressFamily, TcpClient> SocketFactory = DefaultSocketFactory;
+        public Func<AddressFamily, ITcpClient> SocketFactory = DefaultSocketFactory;
 #endif
 
         /// <summary>
@@ -72,13 +72,13 @@ public static StreamSocket DefaultSocketFactory()
             return tcpClient;
         }
 #else
-        public static TcpClient DefaultSocketFactory(AddressFamily addressFamily)
+        public static ITcpClient DefaultSocketFactory(AddressFamily addressFamily)
         {
             var tcpClient = new TcpClient(addressFamily)
             {
                 NoDelay = true
             };
-            return tcpClient;
+            return new TcpClientAdapter(tcpClient);
         }
 #endif
     }

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

@@ -104,7 +104,7 @@ public interface IProtocol
         IFrameHandler CreateFrameHandler(
             AmqpTcpEndpoint endpoint, 
 #if !NETFX_CORE
-            Func<AddressFamily, TcpClient> socketFactory, 
+            Func<AddressFamily, ITcpClient> socketFactory, 
 #else
             Func<StreamSocket> socketFactory,
 #endif

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

@@ -0,0 +1,28 @@
+using System;
+using System.Net.Sockets;
+
+namespace RabbitMQ.Client
+{
+    /// <summary>
+    /// 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
+    {
+        bool Connected { get; }
+
+        int ReceiveTimeout { get; set; }
+
+        Socket Client { get; set; }
+
+
+        IAsyncResult BeginConnect(string host, int port, AsyncCallback requestCallback, object state);
+
+        void EndConnect(IAsyncResult asyncResult);
+
+        NetworkStream GetStream();
+
+        void Close();
+
+    }
+}

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

@@ -147,7 +147,7 @@ public IConnection CreateConnection(ConnectionFactory factory,
         public IFrameHandler CreateFrameHandler(
             AmqpTcpEndpoint endpoint,
 #if !NETFX_CORE
-            Func<AddressFamily, TcpClient> socketFactory, 
+            Func<AddressFamily, ITcpClient> socketFactory, 
 #else
             Func<StreamSocket> socketFactory,
 #endif

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

@@ -59,13 +59,13 @@ public class SocketFrameHandler : IFrameHandler
         protected int m_writeableStateTimeout = 30000;
 
         public NetworkBinaryReader m_reader;
-        public TcpClient m_socket;
+        public ITcpClient m_socket;
         public NetworkBinaryWriter m_writer;
         private readonly object _semaphore = new object();
         private bool _closed;
 
         public SocketFrameHandler(AmqpTcpEndpoint endpoint,
-            Func<AddressFamily, TcpClient> socketFactory,
+            Func<AddressFamily, ITcpClient> socketFactory,
             int timeout)
         {
             Endpoint = endpoint;
@@ -250,7 +250,7 @@ public void Flush()
             }
         }
 
-        private void Connect(TcpClient socket, AmqpTcpEndpoint endpoint, int timeout)
+        private void Connect(ITcpClient socket, AmqpTcpEndpoint endpoint, int timeout)
         {
             IAsyncResult ar = null;
             try

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

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Sockets;
+using System.Text;
+
+namespace RabbitMQ.Client
+{
+
+
+    /// <summary>
+    /// Simple wrapper around TcpClient. 
+    /// </summary>
+    public class TcpClientAdapter : ITcpClient
+    {
+        protected TcpClient _tcpClient;
+
+
+        public TcpClientAdapter(TcpClient tcpClient)
+        {
+            _tcpClient = tcpClient;
+        }
+
+        public virtual IAsyncResult BeginConnect(string host, int port, AsyncCallback requestCallback, object state)
+        {
+            assertTcpClient();
+            
+            return _tcpClient.BeginConnect(host, port, requestCallback, state);
+        }
+
+        private void assertTcpClient()
+        {
+            if (_tcpClient == null)
+                throw new InvalidOperationException("Field tcpClient is null. Should have been passed to constructor.");
+        }
+
+        public virtual void EndConnect(IAsyncResult asyncResult)
+        {
+            assertTcpClient();
+
+            _tcpClient.EndConnect(asyncResult);
+        }
+
+        public virtual void Close()
+        {
+            assertTcpClient();
+
+            _tcpClient.Close();
+        }
+
+        public virtual NetworkStream GetStream()
+        {
+            assertTcpClient();
+
+            return _tcpClient.GetStream();
+        }
+
+        public virtual Socket Client
+        {
+            get
+            {
+                assertTcpClient();
+
+                return _tcpClient.Client;
+            }
+            set
+            {
+                _tcpClient.Client = value;
+            }
+        }
+
+        public virtual bool Connected
+        {
+            get { return _tcpClient!=null && _tcpClient.Connected; }
+        }
+
+        public virtual int ReceiveTimeout
+        {
+            get
+            {
+                return _tcpClient.ReceiveTimeout;
+            }
+            set
+            {
+                _tcpClient.ReceiveTimeout = value;
+            }
+        }
+
+    }
+
+}