diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_reader.erl | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 1600b6809e..04c2a159e6 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -849,13 +849,11 @@ handle_method0(#'connection.tune_ok'{frame_max = FrameMax, ok = validate_negotiated_integer_value(frame_max, FrameMax, server_frame_max(), - ?FRAME_MIN_SIZE, - State), + ?FRAME_MIN_SIZE), ok = validate_negotiated_integer_value(channel_max, ChannelMax, server_channel_max(), - ?CHANNEL_MIN, - State), + ?CHANNEL_MIN), {ok, Collector} = rabbit_connection_helper_sup:start_queue_collector(SupPid), Frame = rabbit_binary_generator:build_heartbeat_frame(), @@ -919,20 +917,17 @@ handle_method0(_Method, #v1{connection_state = S}) -> rabbit_misc:protocol_error( channel_error, "unexpected method in connection state ~w", [S]). -validate_negotiated_integer_value(Field, ClientValue, ServerValue, Min, - State = #v1{sock = Sock, connection = Connection}) -> - Protocol = Connection#connection.protocol, +validate_negotiated_integer_value(Field, ClientValue, ServerValue, Min) -> if ClientValue /= 0 andalso ClientValue < Min -> - fail_negotiation(Field, ClientValue, ServerValue, min, State); + fail_negotiation(Field, ClientValue, ServerValue, min); ServerValue /= 0 andalso ClientValue > ServerValue -> - fail_negotiation(Field, ClientValue, ServerValue, max, State); + fail_negotiation(Field, ClientValue, ServerValue, max); true -> ok end. fail_negotiation(Field, ClientValue, - ServerValue, MinOrMax, - State = #v1{sock = Sock, connection = Connection}) -> + ServerValue, MinOrMax) -> S1 = case MinOrMax of min -> lower; max -> greater |