bug23486 merged into default

Author: Marek Majkowski

docs/specs/amqp0-9-1.stripped.xml

@@ -239,6 +239,32 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <method name="delete-ok" synchronous="1" index="21">
       <chassis name="client" implement="MUST"/>
     </method>
+    <method name="bind" synchronous="1" index="30">
+      <chassis name="server" implement="MUST"/>
+      <response name="bind-ok"/>
+      <field name="reserved-1" type="short" reserved="1"/>
+      <field name="destination" domain="exchange-name"/>
+      <field name="source" domain="exchange-name"/>
+      <field name="routing-key" domain="shortstr"/>
+      <field name="no-wait" domain="no-wait"/>
+      <field name="arguments" domain="table"/>
+    </method>
+    <method name="bind-ok" synchronous="1" index="31">
+      <chassis name="client" implement="MUST"/>
+    </method>
+    <method name="unbind" synchronous="1" index="40">
+      <chassis name="server" implement="MUST"/>
+      <response name="unbind-ok"/>
+      <field name="reserved-1" type="short" reserved="1"/>
+      <field name="destination" domain="exchange-name"/>
+      <field name="source" domain="exchange-name"/>
+      <field name="routing-key" domain="shortstr"/>
+      <field name="no-wait" domain="no-wait"/>
+      <field name="arguments" domain="table"/>
+    </method>
+    <method name="unbind-ok" synchronous="1" index="41">
+      <chassis name="client" implement="MUST"/>
+    </method>
   </class>
   <class name="queue" handler="channel" index="50">
     <chassis name="server" implement="MUST"/>

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

@@ -199,6 +199,28 @@ void ExchangeDelete(string exchange,
                             [AmqpNowaitArgument(null)]
                             bool nowait);
 
+        ///<summary>(Spec method) Bind an exchange to an exchange.</summary>
+        [AmqpUnsupported("RabbitMQ.Client.Framing.v0_8"),
+         AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid"),
+         AmqpUnsupported("RabbitMQ.Client.Framing.v0_9")]
+        void ExchangeBind(string destination,
+                          string source,
+                          string routingKey,
+                          [AmqpNowaitArgument(null)]
+                          bool nowait,
+                          IDictionary arguments);
+
+        ///<summary>(Spec method) Unbind an exchange from an exchange.</summary>
+        [AmqpUnsupported("RabbitMQ.Client.Framing.v0_8"),
+         AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid"),
+         AmqpUnsupported("RabbitMQ.Client.Framing.v0_9")]
+        void ExchangeUnbind(string destination,
+                            string source,
+                            string routingKey,
+                            [AmqpNowaitArgument(null)]
+                            bool nowait,
+                            IDictionary arguments);
+
         ///<summary>(Spec method) Declare a queue.</summary>
         ///<remarks>
         ///The queue is declared non-passive, non-durable,

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

@@ -61,7 +61,7 @@ public interface IFrameHandler
         AmqpTcpEndpoint Endpoint { get; }
 
         ///<summary>Socket read timeout, in milliseconds. Zero signals "infinity".</summary>
-        int Timeout { get; set; }
+        int Timeout { set; }
 
         void SendHeader();
 

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

@@ -633,6 +633,18 @@ public abstract void ExchangeDelete(string exchange,
                                             bool ifUnused,
                                             bool nowait);
 
+        public abstract void ExchangeBind(string destination,
+                                          string source,
+                                          string routingKey,
+                                          bool nowait,
+                                          IDictionary arguments);
+
+        public abstract void ExchangeUnbind(string destination,
+                                            string source,
+                                            string routingKey,
+                                            bool nowait,
+                                            IDictionary arguments);
+
         //TODO: Mark these as virtual, maybe the model has an optimized way
         //      of dealing with missing parameters.
         public string QueueDeclare()

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

@@ -104,13 +104,12 @@ public AmqpTcpEndpoint Endpoint
 
         public int Timeout
         {
-            get
-            {
-                return m_socket.ReceiveTimeout;
-            }
-            set
-            {
-                m_socket.ReceiveTimeout = value;
+            set
+            {
+                if (m_socket.Connected)
+                {
+                    m_socket.ReceiveTimeout = value;
+                }
             }
         }