root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Make the Erlang client work again.

This commit is contained in:
Simon MacMullen 2010-06-25 12:01:12 +01:00
parent b158b5c7f1
commit 8a61be28ef
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deps/amqp_client/include/amqp_client.hrl vendored
View File

@ -26,8 +26,11 @@
-include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("rabbit_common/include/rabbit.hrl").
-include_lib("rabbit_common/include/rabbit_framing.hrl"). -include_lib("rabbit_common/include/rabbit_framing.hrl").
-define(PROTOCOL_VERSION_MAJOR, 0).
-define(PROTOCOL_VERSION_MINOR, 8).
-define(PROTOCOL_HEADER, -define(PROTOCOL_HEADER,
<<"AMQP", 1, 1, ?PROTOCOL_VERSION_MAJOR, ?PROTOCOL_VERSION_MINOR>>). <<"AMQP", 1, 1, ?PROTOCOL_VERSION_MAJOR, ?PROTOCOL_VERSION_MINOR>>).
-define(PROTOCOL, amqp_0_8).
-define(MAX_CHANNEL_NUMBER, 65535). -define(MAX_CHANNEL_NUMBER, 65535).

2
deps/amqp_client/rabbit_common.app.in vendored
View File

@ -5,6 +5,8 @@
rabbit_writer, rabbit_writer,
rabbit_reader, rabbit_reader,
rabbit_framing, rabbit_framing,
rabbit_framing_amqp_0_8,
rabbit_framing_amqp_0_9_1,
rabbit_framing_channel, rabbit_framing_channel,
rabbit_basic, rabbit_basic,
rabbit_binary_generator, rabbit_binary_generator,

6
deps/amqp_client/src/amqp_channel_util.erl vendored
View File

@ -56,8 +56,10 @@ open_channel(ProposedNumber, MaxChannel, Driver, StartArgs, Channels) ->
%%--------------------------------------------------------------------------- %%---------------------------------------------------------------------------
start_channel_infrastructure(network, ChannelNumber, {Sock, MainReader}) -> start_channel_infrastructure(network, ChannelNumber, {Sock, MainReader}) ->
FramingPid = rabbit_framing_channel:start_link(fun(X) -> X end, [self()]), FramingPid = rabbit_framing_channel:start_link(fun(X) -> X end, [self()],
WriterPid = rabbit_writer:start_link(Sock, ChannelNumber, ?FRAME_MIN_SIZE), ?PROTOCOL),
WriterPid = rabbit_writer:start_link(Sock, ChannelNumber, ?FRAME_MIN_SIZE,
?PROTOCOL),
case MainReader of case MainReader of
none -> none ->
ok; ok;

2
deps/amqp_client/src/amqp_main_reader.erl vendored
View File

@ -95,7 +95,7 @@ handle_inet_async({inet_async, Sock, _, Msg},
end. end.
handle_frame(Type, Channel, Payload, State) -> 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 -> heartbeat when Channel /= 0 ->
rabbit_misc:die(frame_error); rabbit_misc:die(frame_error);
trace when Channel /= 0 -> trace when Channel /= 0 ->