From 8a61be28efcc28279121e3bd7cf3f92491cf4686 Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@rabbitmq.com>
Date: Fri, 25 Jun 2010 12:01:12 +0100
Subject: [PATCH] Make the Erlang client work again.

---
 deps/amqp_client/include/amqp_client.hrl   | 3 +++
 deps/amqp_client/rabbit_common.app.in      | 2 ++
 deps/amqp_client/src/amqp_channel_util.erl | 6 ++++--
 deps/amqp_client/src/amqp_main_reader.erl  | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/deps/amqp_client/include/amqp_client.hrl b/deps/amqp_client/include/amqp_client.hrl
index 9b481fc054..216abe810d 100755
--- a/deps/amqp_client/include/amqp_client.hrl
+++ b/deps/amqp_client/include/amqp_client.hrl
@@ -26,8 +26,11 @@
 -include_lib("rabbit_common/include/rabbit.hrl").
 -include_lib("rabbit_common/include/rabbit_framing.hrl").
 
+-define(PROTOCOL_VERSION_MAJOR, 0).
+-define(PROTOCOL_VERSION_MINOR, 8).
 -define(PROTOCOL_HEADER,
         <<"AMQP", 1, 1, ?PROTOCOL_VERSION_MAJOR, ?PROTOCOL_VERSION_MINOR>>).
+-define(PROTOCOL, amqp_0_8).
 
 -define(MAX_CHANNEL_NUMBER, 65535).
 
diff --git a/deps/amqp_client/rabbit_common.app.in b/deps/amqp_client/rabbit_common.app.in
index 6df715da6d..e80236da96 100755
--- a/deps/amqp_client/rabbit_common.app.in
+++ b/deps/amqp_client/rabbit_common.app.in
@@ -5,6 +5,8 @@
              rabbit_writer,
              rabbit_reader,
              rabbit_framing,
+             rabbit_framing_amqp_0_8,
+             rabbit_framing_amqp_0_9_1,
              rabbit_framing_channel,
              rabbit_basic,
              rabbit_binary_generator,
diff --git a/deps/amqp_client/src/amqp_channel_util.erl b/deps/amqp_client/src/amqp_channel_util.erl
index bc8a2a34f1..3ceb758f9e 100755
--- a/deps/amqp_client/src/amqp_channel_util.erl
+++ b/deps/amqp_client/src/amqp_channel_util.erl
@@ -56,8 +56,10 @@ open_channel(ProposedNumber, MaxChannel, Driver, StartArgs, Channels) ->
 %%---------------------------------------------------------------------------
 
 start_channel_infrastructure(network, ChannelNumber, {Sock, MainReader}) ->
-    FramingPid = rabbit_framing_channel:start_link(fun(X) -> X end, [self()]),
-    WriterPid = rabbit_writer:start_link(Sock, ChannelNumber, ?FRAME_MIN_SIZE),
+    FramingPid = rabbit_framing_channel:start_link(fun(X) -> X end, [self()],
+                                                  ?PROTOCOL),
+    WriterPid = rabbit_writer:start_link(Sock, ChannelNumber, ?FRAME_MIN_SIZE,
+                                        ?PROTOCOL),
     case MainReader of
         none ->
             ok;
diff --git a/deps/amqp_client/src/amqp_main_reader.erl b/deps/amqp_client/src/amqp_main_reader.erl
index 8df8f919c2..4b1809ab51 100755
--- a/deps/amqp_client/src/amqp_main_reader.erl
+++ b/deps/amqp_client/src/amqp_main_reader.erl
@@ -95,7 +95,7 @@ handle_inet_async({inet_async, Sock, _, Msg},
     end.
 
 handle_frame(Type, Channel, Payload, State) ->
-    case rabbit_reader:analyze_frame(Type, Payload) of
+    case rabbit_reader:analyze_frame(Type, Payload, ?PROTOCOL) of
         heartbeat when Channel /= 0 ->
             rabbit_misc:die(frame_error);
         trace when Channel /= 0 ->