Further 0.9.1 updates

Emile Joubert · Emile Joubert · commit 57cc2574850b · 2010-06-03T17:43:25.000+01:00
diff --git a/projects/client/Apigen/src/apigen/AmqpMethod.cs b/projects/client/Apigen/src/apigen/AmqpMethod.cs
@@ -68,12 +68,7 @@ public AmqpMethod(XmlNode n)
         {
             m_Fields = new ArrayList();
             foreach (XmlNode f in n.SelectNodes("field")) {
-
-                AmqpField field = new AmqpField(f);
-                if (!field.Reserved)
-                {
-                    m_Fields.Add(field);
-                }  
+                m_Fields.Add(new AmqpField(f));                
             }
             m_ResponseMethods = new ArrayList();
             foreach (XmlNode r in n.SelectNodes("response")) {
diff --git a/projects/client/Apigen/src/apigen/Apigen.cs b/projects/client/Apigen/src/apigen/Apigen.cs
@@ -168,6 +168,7 @@ public static string MangleMethodClass(AmqpClass c, AmqpMethod m) {
         public int? m_revision;
         public string m_apiName;
         public bool m_emitComments = false;
+        public bool m_supportsRedirect;
 
         public Type m_modelType = typeof(RabbitMQ.Client.Impl.IFullModel);
         public ArrayList m_modelTypes = new ArrayList();
@@ -296,7 +297,10 @@ public void ParseSpec() {
             }
             foreach (XmlNode n in m_spec.SelectNodes("/amqp/domain")) {
                 m_domains[GetString(n, "@name")] = GetString(n, "@type");
-            }
+            }            
+            m_supportsRedirect = 
+                m_spec.SelectSingleNode(
+                "/amqp/class[@name='connection']/method[@name='redirect']") != null;        
         }
 
         public void ReflectModel() {
@@ -431,6 +435,9 @@ public void EmitPublic() {
             int port = GetInt(m_spec, "/amqp/@port");
             EmitLine("    ///<summary>Default TCP port (= "+port+")</summary>");
             EmitLine("    public override int DefaultPort { get { return " + port + "; } }");
+            EmitLine("    ///<summary>Whether redirect is supported</summary>");
+            EmitLine("    public override bool SupportsRedirect { get { return "
+                + m_supportsRedirect.ToString().ToLower() + "; } }");
             EmitLine("");
             EmitMethodArgumentReader();
             EmitLine("");
diff --git a/projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs b/projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs
@@ -324,7 +324,14 @@ public virtual IConnection CreateConnection(int maxRedirects)
         ///No broker-originated redirects are permitted.</summary>
         public virtual IConnection CreateConnection()
         {
-            return CreateConnection(0);
+            if (Protocol.SupportsRedirect)
+            {
+                return CreateConnection(0); 
+            }
+            else
+            {               
+                return Protocol.CreateConnection(this, false, Protocol.CreateFrameHandler(Endpoint));
+            }
         }
     }
 }
diff --git a/projects/client/RabbitMQ.Client/src/client/api/IModel.cs b/projects/client/RabbitMQ.Client/src/client/api/IModel.cs
@@ -561,7 +561,8 @@ void _Private_BasicCancel(string consumerTag,
         ///<summary>Used to send a Channel.Open. Called during session
         ///initialisation.</summary>
         [AmqpMethodMapping(null, "channel", "open")]
-        void _Private_ChannelOpen([AmqpUnsupported("RabbitMQ.Client.Framing.v0_9_1")]
+        void _Private_ChannelOpen([AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9_1",
+                                  "reserved1")]
                                   string outOfBand);
 
         ///<summary>Used to send a Channel.CloseOk. Called during
@@ -684,9 +685,9 @@ void ConnectionTuneOk(ushort channelMax,
         [AmqpForceOneWay]
         [AmqpMethodMapping(null, "connection", "open")]
         void _Private_ConnectionOpen(string virtualHost,
-                                     [AmqpUnsupported("RabbitMQ.Client.Framing.v0_9_1")]
-                                     string capabilities,
-                                     [AmqpUnsupported("RabbitMQ.Client.Framing.v0_9_1")]
+                                     [AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9_1", "reserved1")]
+                                     string capabilities,                                    
+                                     [AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9_1", "reserved2")]
                                      bool insist);
 
         ///<summary>Handle an incoming Connection.OpenOk.</summary>
diff --git a/projects/client/RabbitMQ.Client/src/client/api/IProtocol.cs b/projects/client/RabbitMQ.Client/src/client/api/IProtocol.cs
@@ -74,6 +74,8 @@ public interface IProtocol
         string ApiName { get; }
         ///<summary>Retrieve the protocol's default TCP port</summary>
         int DefaultPort { get; }
+        ///<summary>Whether redirect is supported</summary>
+        bool SupportsRedirect { get; }
 
         ///<summary>Construct a frame handler for a given endpoint.</summary>
         IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint);
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/AbstractProtocolBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/AbstractProtocolBase.cs
@@ -65,6 +65,7 @@ public abstract class AbstractProtocolBase: IProtocol {
         public abstract int? Revision { get; }
         public abstract string ApiName { get; }
         public abstract int DefaultPort { get; }
+        public abstract bool SupportsRedirect { get; }
 
         public abstract IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint);
         public abstract IConnection CreateConnection(ConnectionFactory factory,
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs
@@ -1010,10 +1010,17 @@ public void Open(bool insist)
                                       frameMax,
                                       heartbeat);
 
-            string knownHosts = m_model0.ConnectionOpen(m_factory.VirtualHost,
-                                                        "", // FIXME: make configurable?
-                                                        insist);
-            KnownHosts = AmqpTcpEndpoint.ParseMultiple(Protocol, knownHosts);
+            if (Protocol.SupportsRedirect)
+            {
+                string knownHosts = m_model0.ConnectionOpen(m_factory.VirtualHost,
+                                                            "", // FIXME: make configurable?
+                                                            insist);
+                KnownHosts = AmqpTcpEndpoint.ParseMultiple(Protocol, knownHosts);
+            }
+            else
+            {
+                m_model0.ConnectionOpen(m_factory.VirtualHost, String.Empty, false);
+            }
         }
 
         public override string ToString()
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs
@@ -303,6 +303,7 @@ public void TransmitAndEnqueue(Command cmd, IRpcContinuation k)
             }
             catch (AlreadyClosedException)
             {
+                int i = 1;
                 // Ignored, since the continuation will be told about
                 // the closure via an OperationInterruptedException because
                 // of the shutdown event propagation.
@@ -410,6 +411,18 @@ public void HandleConnectionStart(byte versionMajor,
                                           IDictionary serverProperties,
                                           byte[] mechanisms,
                                           byte[] locales)
+        {
+            HandleConnectionStart(versionMajor,
+                                  versionMinor,
+                                  serverProperties,
+                                  locales);
+            details.m_mechanisms = mechanisms;
+        }
+
+        public void HandleConnectionStart(byte versionMajor,
+                                          byte versionMinor,
+                                          IDictionary serverProperties,
+                                          byte[] locales)
         {
             if (m_connectionStartCell == null)
             {
@@ -423,7 +436,6 @@ public void HandleConnectionStart(byte versionMajor,
             details.m_versionMajor = versionMajor;
             details.m_versionMinor = versionMinor;
             details.m_serverProperties = serverProperties;
-            details.m_mechanisms = mechanisms;
             details.m_locales = locales;
             m_connectionStartCell.Value = details;
             m_connectionStartCell = null;

Original file line number	Diff line number	Diff line change
`@@ -68,12 +68,7 @@ public AmqpMethod(XmlNode n)`
`68`	`68`	`{`
`69`	`69`	`m_Fields = new ArrayList();`
`70`	`70`	`foreach (XmlNode f in n.SelectNodes("field")) {`
`71`		`-`
`72`		`- AmqpField field = new AmqpField(f);`
`73`		`- if (!field.Reserved)`
`74`		`- {`
`75`		`- m_Fields.Add(field);`
`76`		`- }`
	`71`	`+ m_Fields.Add(new AmqpField(f));`
`77`	`72`	`}`
`78`	`73`	`m_ResponseMethods = new ArrayList();`
`79`	`74`	`foreach (XmlNode r in n.SelectNodes("response")) {`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,14 @@ public virtual IConnection CreateConnection(int maxRedirects)`
`324`	`324`	`///No broker-originated redirects are permitted.</summary>`
`325`	`325`	`public virtual IConnection CreateConnection()`
`326`	`326`	`{`
`327`		`- return CreateConnection(0);`
	`327`	`+ if (Protocol.SupportsRedirect)`
	`328`	`+ {`
	`329`	`+ return CreateConnection(0);`
	`330`	`+ }`
	`331`	`+ else`
	`332`	`+ {`
	`333`	`+ return Protocol.CreateConnection(this, false, Protocol.CreateFrameHandler(Endpoint));`
	`334`	`+ }`
`328`	`335`	`}`
`329`	`336`	`}`
`330`	`337`	`}`