fix default port handling

Author: David R. MacIver

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

@@ -81,13 +81,19 @@ public string HostName
             set { m_hostName = value; }
         }
 
+
+        public const int DEFAULT_PORT = 5672;
+        public const int DEFAULT_SSL_PORT = 5671;
+
+
+
         private int m_port;
         ///<summary>Retrieve or set the port number of this
         ///AmqpTcpEndpoint. -1 indicates the default value should be used.
         ///</summary>
         public int Port
         {
-            get { return m_port; }
+            get { return m_port == -1 ? (Ssl.Enabled ? DEFAULT_SSL_PORT : DEFAULT_PORT ) : m_port; }
             set { m_port = value; }
         }
 

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

@@ -73,19 +73,5 @@ public ConnectionParameters(AMQPParameters amqp, AmqpTcpEndpoint tcp){
       public ConnectionParameters() : this(new AMQPParameters(), new AmqpTcpEndpoint()){
       }
 
-      // TODO: This should really be part of the protocol, but it's unlikely to change
-      // and has this value in all versions we support. 
-      public const int DEFAULT_SSL_PORT = 5671;
-
-
-      public int Port{
-        get{
-          if(TCP.Port == -1){
-            return TCP.Ssl.Enabled ? DEFAULT_SSL_PORT : AMQP.Protocol.DefaultPort;
-          } else {
-            return TCP.Port;
-          }
-        }
-      }
     }
 }

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

@@ -74,7 +74,7 @@ public interface IProtocol
         int DefaultPort { get; }
 
         ///<summary>Construct a frame handler for a given endpoint.</summary>
-        IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint);
+        IFrameHandler CreateFrameHandler(AmqpTcpEndpoint parameters);
         ///<summary>Construct a connection from a given set of
         ///parameters and a frame handler. The "insist" parameter is
         ///passed on to the AMQP connection.open method.</summary>

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

@@ -62,7 +62,6 @@ namespace RabbitMQ.Client.Framing.Impl.v0_8qpid {
     public abstract class ProtocolBase: AbstractProtocolBase {
 
         public override IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint) {
-            //TODO: Query why we are creating a 0.9 frame handler for a 0.8 protocol
             return new SocketFrameHandler_0_9(this, endpoint);
         }
 

projects/client/Unit/src/unit/TestSsl.cs

@@ -63,8 +63,7 @@
 public class TestSsl {
 
     public void SendReceive(ConnectionFactory cf) {
-        IProtocol proto = Protocols.DefaultProtocol;
-        using (IConnection conn = cf.CreateConnection(proto, "localhost", 5671)) {
+        using (IConnection conn = cf.CreateConnection()) {
             IModel ch = conn.CreateModel();
 
             ch.ExchangeDeclare("Exchange_TestSslEndPoint", ExchangeType.Direct);
@@ -88,11 +87,12 @@ public void SendReceive(ConnectionFactory cf) {
     public void TestServerVerifiedIgnoringNameMismatch() {
         string sslDir = Environment.GetEnvironmentVariable("SSL_CERTS_DIR");
         if (null == sslDir) return;
-
-        ConnectionFactory cf = new ConnectionFactory();
-        cf.Parameters.Ssl.ServerName = "*";
-        cf.Parameters.Ssl.AcceptablePolicyErrors = SslPolicyErrors.RemoteCertificateNameMismatch;
-        cf.Parameters.Ssl.Enabled = true;
+        
+        AmqpTcpEndpoint endpoint = new AmqpTcpEndpoint();
+        endpoint.Ssl.ServerName = "*";
+        endpoint.Ssl.AcceptablePolicyErrors = SslPolicyErrors.RemoteCertificateNameMismatch;
+        endpoint.Ssl.Enabled = true;
+        ConnectionFactory cf = new ConnectionFactory(endpoint);
         SendReceive(cf);
     }
 
@@ -101,9 +101,10 @@ public void TestServerVerified() {
         string sslDir = Environment.GetEnvironmentVariable("SSL_CERTS_DIR");
         if (null == sslDir) return;
 
-        ConnectionFactory cf = new ConnectionFactory();
-        cf.Parameters.Ssl.ServerName = System.Net.Dns.GetHostName();
-        cf.Parameters.Ssl.Enabled = true;
+        AmqpTcpEndpoint endpoint = new AmqpTcpEndpoint();
+        endpoint.Ssl.ServerName = System.Net.Dns.GetHostName();
+        endpoint.Ssl.Enabled = true;
+        ConnectionFactory cf = new ConnectionFactory(endpoint);
         SendReceive(cf);
     }
 
@@ -112,14 +113,14 @@ public void TestClientAndServerVerified() {
         string sslDir = Environment.GetEnvironmentVariable("SSL_CERTS_DIR");
         if (null == sslDir) return;
 
-        ConnectionFactory cf = new ConnectionFactory();
-        cf.Parameters.Ssl.ServerName = System.Net.Dns.GetHostName();
-        Assert.IsNotNull(sslDir);
-        cf.Parameters.Ssl.CertPath = sslDir + "/client/keycert.p12";
+        AmqpTcpEndpoint endpoint = new AmqpTcpEndpoint();
+        endpoint.Ssl.ServerName = System.Net.Dns.GetHostName();
+        endpoint.Ssl.CertPath = sslDir + "/client/keycert.p12";
         string p12Password = Environment.GetEnvironmentVariable("PASSWORD");
         Assert.IsNotNull(p12Password, "missing PASSWORD env var");
-        cf.Parameters.Ssl.CertPassphrase = p12Password;
-        cf.Parameters.Ssl.Enabled = true;
+        endpoint.Ssl.CertPassphrase = p12Password;
+        endpoint.Ssl.Enabled = true;
+        ConnectionFactory cf = new ConnectionFactory(endpoint);
         SendReceive(cf);
     }
 }

projects/examples/client/AddClient/src/examples/AddClient.cs

@@ -71,7 +71,7 @@ public static int Main(string[] args) {
                 return 2;
             }
 
-            using (IConnection conn = new ConnectionFactory().CreateConnection(args[0])) {
+            using (IConnection conn = new ConnectionFactory(AmqpTcpEndpoint.Parse(args[0])).CreateConnection()) {
                 using (IModel ch = conn.CreateModel()) {
 
                     object[] addends = new object[args.Length - 1];

projects/examples/client/AddServer/src/examples/AddServer.cs

@@ -72,7 +72,7 @@ public static int Main(string[] args) {
                 return 2;
             }
 
-            using (IConnection conn = new ConnectionFactory().CreateConnection(args[0])) {
+            using (IConnection conn = new ConnectionFactory(AmqpTcpEndpoint.Parse(args[0])).CreateConnection()) {
                 using (IModel ch = conn.CreateModel()) {
                     Subscription sub = new Subscription(ch, "AddServer");
                     new AddServer(sub).MainLoop();