diff options
| author | Erlang/OTP <[email protected]> | 2015-10-13 14:47:28 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-10-13 14:47:28 +0200 |
| commit | d7f76c4800b279f69c1f0a6f885f5f659e627127 (patch) | |
| tree | 52e4a191baa38b629867c019b0281490c4e52353 /lib/ssh/src/ssh.erl | |
| parent | a2c538dee3013bb6285027d9ae45b7f055e8e8eb (diff) | |
| parent | e5d5c462c09b631af417347154a04378f6186778 (diff) | |
| download | otp-d7f76c4800b279f69c1f0a6f885f5f659e627127.tar.gz otp-d7f76c4800b279f69c1f0a6f885f5f659e627127.tar.bz2 otp-d7f76c4800b279f69c1f0a6f885f5f659e627127.zip | |
Merge branch 'hans/ssh/option_max_channels/OTP-13036' into maint-18
* hans/ssh/option_max_channels/OTP-13036:
ssh: update vsn.mk
ssh: Option max_channels added.
Diffstat (limited to 'lib/ssh/src/ssh.erl')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index 132de71aed..ee44324c12 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -385,6 +385,8 @@ handle_option([{rekey_limit, _} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{max_sessions, _} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); +handle_option([{max_channels, _} = Opt|Rest], SocketOptions, SshOptions) -> + handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{negotiation_timeout, _} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{parallel_login, _} = Opt|Rest], SocketOptions, SshOptions) -> @@ -443,6 +445,8 @@ handle_ssh_option({connect_timeout, Value} = Opt) when is_integer(Value); Value Opt; handle_ssh_option({max_sessions, Value} = Opt) when is_integer(Value), Value>0 -> Opt; +handle_ssh_option({max_channels, Value} = Opt) when is_integer(Value), Value>0 -> + Opt; handle_ssh_option({negotiation_timeout, Value} = Opt) when is_integer(Value); Value == infinity -> Opt; handle_ssh_option({parallel_login, Value} = Opt) when Value==true ; Value==false -> |