diff options
| author | Michael Klishin <michael@rabbitmq.com> | 2013-11-26 14:58:21 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@rabbitmq.com> | 2013-11-26 14:58:21 +0400 |
| commit | 66530295f89363994b1697a1dd8cabb28fa05e41 (patch) | |
| tree | 3ec2e72a07030c8530706f180226a313cd01d130 /src | |
| parent | 0621903cda51796a87b87d2aa62b2fdf71a8e605 (diff) | |
| download | rabbitmq-server-git-66530295f89363994b1697a1dd8cabb28fa05e41.tar.gz | |
Pass socket around instead of the entire state
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_reader.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 945e38a421..b1daeb918c 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -847,13 +847,13 @@ handle_method0(#'connection.tune_ok'{frame_max = FrameMax, helper_sup = SupPid, sock = Sock}) -> Protocol = Connection#connection.protocol, - ok = validate_negotiated_integer_value(State, + ok = validate_negotiated_integer_value(State#v1.sock, frame_max, FrameMax, server_frame_max(), ?FRAME_MIN_SIZE, Protocol), - ok = validate_negotiated_integer_value(State, + ok = validate_negotiated_integer_value(State#v1.sock, channel_max, ChannelMax, server_channel_max(), @@ -922,14 +922,14 @@ handle_method0(_Method, #v1{connection_state = S}) -> rabbit_misc:protocol_error( channel_error, "unexpected method in connection state ~w", [S]). -validate_negotiated_integer_value(State, Field, ClientValue, ServerValue, Min, Protocol) -> +validate_negotiated_integer_value(Socket, Field, ClientValue, ServerValue, Min, Protocol) -> if ClientValue /= 0 andalso ClientValue < Min -> AmqpError = rabbit_misc:amqp_error( not_allowed, "negotiated ~p = ~w is lower than the minimum allowedvalue (~w)", [Field, ClientValue, ServerValue], none), {0, CloseMethod} = rabbit_binary_generator:map_exception(0, AmqpError, Protocol), - ok = send_on_channel0(State#v1.sock, CloseMethod, Protocol), + ok = send_on_channel0(Socket, CloseMethod, Protocol), rabbit_misc:protocol_error(AmqpError); ServerValue /= 0 andalso ClientValue > ServerValue -> AmqpError = rabbit_misc:amqp_error( @@ -937,7 +937,7 @@ validate_negotiated_integer_value(State, Field, ClientValue, ServerValue, Min, P [Field, ClientValue, ServerValue], none), {0, CloseMethod} = rabbit_binary_generator:map_exception(0, AmqpError, Protocol), - ok = send_on_channel0(State#v1.sock, CloseMethod, Protocol), + ok = send_on_channel0(Socket, CloseMethod, Protocol), rabbit_misc:protocol_error(AmqpError); true -> ok |