diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-06-24 13:17:53 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-06-24 13:17:53 +0100 |
| commit | 96a1984b44dbd71cfd0191d1e4dcca7f84d197a7 (patch) | |
| tree | 94d41a108b1ef73f30d6eb653a839d26fb825a60 | |
| parent | d0e12bd0f6eeb2631637b7feb67cf8ef1bfa7c50 (diff) | |
| download | rabbitmq-server-96a1984b44dbd71cfd0191d1e4dcca7f84d197a7.tar.gz | |
Rename protocol constant.
| -rw-r--r-- | src/rabbit_binary_generator.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_framing_channel.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit_binary_generator.erl b/src/rabbit_binary_generator.erl index e29f9fcb..28f34e7c 100644 --- a/src/rabbit_binary_generator.erl +++ b/src/rabbit_binary_generator.erl @@ -78,9 +78,9 @@ build_simple_method_frame(ChannelInt, MethodRecord, Protocol) -> {ClassId, MethodId} = rabbit_framing:method_id(MethodName), create_frame(1, ChannelInt, [<<ClassId:16, MethodId:16>>, MethodFields]). -adjust_close('connection.close', protocol_08) -> +adjust_close('connection.close', amqp_0_8) -> 'connection.close08'; -adjust_close('connection.close_ok', protocol_08) -> +adjust_close('connection.close_ok', amqp_0_8) -> 'connection.close08_ok'; adjust_close(MethodName, _Protocol) -> MethodName. diff --git a/src/rabbit_framing_channel.erl b/src/rabbit_framing_channel.erl index 6c184c2c..648a3fdd 100644 --- a/src/rabbit_framing_channel.erl +++ b/src/rabbit_framing_channel.erl @@ -84,13 +84,13 @@ mainloop(ChannelPid, Protocol) -> %% Handle 0-8 version of channel.open-ok. In 0-9-1 it gained a longstr %% "deprecated_channel_id". -decode_method_fields('channel.open_ok', FieldsBin, protocol_08) -> +decode_method_fields('channel.open_ok', FieldsBin, amqp_0_8) -> Len = 0, rabbit_framing:decode_method_fields( 'channel.open_ok', <<FieldsBin/binary, Len:32/unsigned>>); %% Handle 0-8 version of basic.consume. In 0-9-1 it gained a table %% "filter". -decode_method_fields('basic.consume', FieldsBin, protocol_08) -> +decode_method_fields('basic.consume', FieldsBin, amqp_0_8) -> T = rabbit_binary_generator:generate_table([]), TLen = size(T), rabbit_framing:decode_method_fields( diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index e2d4880b..73884d99 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -523,9 +523,9 @@ analyze_frame(?FRAME_HEARTBEAT, <<>>, _Protocol) -> analyze_frame(_Type, _Body, _Protocol) -> error. -adjust_close('connection.close08', protocol_08) -> +adjust_close('connection.close08', amqp_0_8) -> 'connection.close'; -adjust_close('connection.close08_ok', protocol_08) -> +adjust_close('connection.close08_ok', amqp_0_8) -> 'connection.close_ok'; adjust_close(MethodName, _Protocol) -> MethodName. @@ -549,7 +549,7 @@ handle_input(handshake, <<"AMQP",1,1,ProtocolMajor,ProtocolMinor>>, case check_version({ProtocolMajor, ProtocolMinor}, {?PROTOCOL_VERSION_MAJOR, ?PROTOCOL_VERSION_MINOR}) of true -> - Protocol = protocol_08, + Protocol = amqp_0_8, ok = send_on_channel0( Sock, #'connection.start'{ |