Merge bug21949 into default

Author: tonyg

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

@@ -80,7 +80,7 @@ namespace RabbitMQ.Client
     ///     factory.VirtualHost = ConnectionFactory.DefaultVHost;
     ///     factory.Protocol = Protocols.FromEnvironment();
     ///     factory.HostName = hostName;
-    //      factory.PortNumber = AmqpTcpEndpoint.UseDefaultPort;
+    ///     factory.PortNumber = AmqpTcpEndpoint.UseDefaultPort;
     ///     //
     ///     IConnection conn = factory.CreateConnection();
     ///     //
@@ -144,6 +144,10 @@ public class ConnectionFactory
         /// <summary>Heartbeat setting to request (in seconds)</summary>
         public ushort RequestedHeartbeat = DefaultHeartbeat;
 
+        /// <summary>Dictionary of client properties to be sent to the
+        /// server</summary>
+        public IDictionary ClientProperties = ConnectionBase.DefaultClientProperties();
+
         ///<summary>Ssl options setting</summary>
         public SslOption Ssl = new SslOption();
 

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

@@ -116,6 +116,10 @@ public interface IConnection: IDisposable
         ///(0 for disabled), in seconds.</summary>
         ushort Heartbeat { get; }
 
+        ///<summary>A copy of the client properties that has been sent to the
+        ///server.</summary>
+        IDictionary ClientProperties { get; }
+
         ///<summary>A dictionary of the server properties sent by the server
         ///while establishing the connection. This typically includes
         ///the product name and version of the server.</summary>

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

@@ -93,6 +93,7 @@ public abstract class ConnectionBase : IConnection
         public IFrameHandler m_frameHandler;
         public uint m_frameMax = 0;
         public ushort m_heartbeat = 0;
+        public IDictionary m_clientProperties;
         public IDictionary m_serverProperties;
         public AmqpTcpEndpoint[] m_knownHosts = null;
 
@@ -251,6 +252,18 @@ public ushort Heartbeat
             }
         }
 
+        public IDictionary ClientProperties
+        {
+            get
+            {
+                return new Hashtable(m_clientProperties);
+            }
+            set
+            {
+                m_clientProperties = value;
+            }
+        }
+
         public IDictionary ServerProperties
         {
             get
@@ -909,9 +922,11 @@ public void OnCallbackException(CallbackExceptionEventArgs args)
             }
         }
 
-        public IDictionary BuildClientPropertiesTable()
+        public static IDictionary DefaultClientProperties()
         {
-            string version = this.GetType().Assembly.GetName().Version.ToString();
+            System.Reflection.Assembly assembly =
+                    System.Reflection.Assembly.GetAssembly(typeof(ConnectionBase));
+            string version = assembly.GetName().Version.ToString();
             //TODO: Get the rest of this data from the Assembly Attributes
             Hashtable table = new Hashtable();
             table["product"] = Encoding.UTF8.GetBytes("RabbitMQ");
@@ -968,10 +983,12 @@ public void Open(bool insist)
                                                            serverVersion.Minor);
             }
 
+            m_clientProperties = new Hashtable(m_factory.ClientProperties);
+
             // FIXME: check that PLAIN is supported.
             // FIXME: parse out locales properly!
             ConnectionTuneDetails connectionTune =
-                m_model0.ConnectionStartOk(BuildClientPropertiesTable(),
+                m_model0.ConnectionStartOk(m_clientProperties,
                                            "PLAIN",
                                            Encoding.UTF8.GetBytes("\0" + m_factory.UserName +
                                                                   "\0" + m_factory.Password),