diff options
author | Hans Nilsson <[email protected]> | 2015-10-06 21:18:23 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2015-10-08 18:57:05 +0200 |
commit | 84df3d4d0278e21a36a453bfee94799f0df67c2a (patch) | |
tree | cb039b3147502dab3085d3021f60e9e6378598b0 /lib/ssh/src/ssh.erl | |
parent | a2c538dee3013bb6285027d9ae45b7f055e8e8eb (diff) | |
download | otp-84df3d4d0278e21a36a453bfee94799f0df67c2a.tar.gz otp-84df3d4d0278e21a36a453bfee94799f0df67c2a.tar.bz2 otp-84df3d4d0278e21a36a453bfee94799f0df67c2a.zip |
ssh: Option max_channels added.
It actually counts the number of subsystem alive. Allocating a channel does not consume any resources
(except some cpu cycles), but the subsystem start spawns processes.
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 -> |