diff options
| author | Erlang/OTP <[email protected]> | 2015-04-10 13:09:50 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-04-10 13:09:50 +0200 |
| commit | ed8b9b2d95203b2cfec53d346c768480ade7d9ae (patch) | |
| tree | a139faa1c24231c767a97fc33a653ccfc087b724 /lib/ssh/src/ssh.erl | |
| parent | 545890576542e4be630df8772654b99bd0306f62 (diff) | |
| parent | af095b98e089e3a4a5db5012dbdc0d579367a907 (diff) | |
| download | otp-ed8b9b2d95203b2cfec53d346c768480ade7d9ae.tar.gz otp-ed8b9b2d95203b2cfec53d346c768480ade7d9ae.tar.bz2 otp-ed8b9b2d95203b2cfec53d346c768480ade7d9ae.zip | |
Merge branch 'ia/ssh/packet_size0/OTP-12645' into maint-17
* ia/ssh/packet_size0/OTP-12645:
ssh: Reset upgrade instructions to default
ssh: Change version (vsn.mk)
ssh: Option minimal_remote_max_packet_size and test cases
ssh: fix loop bug for zero maximum_packet_size.
ssh: Add ssh_info:print/1 to write onto a file descriptor
ssh: Add {active, false} to ssh listen socket
ssh: Change send_buf implementation from list to queue
ssh: Remove error report
Diffstat (limited to 'lib/ssh/src/ssh.erl')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index eae33e3683..51ad691ba2 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -345,9 +345,14 @@ handle_option([{parallel_login, _} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([parallel_login|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option({parallel_login,true}) | SshOptions]); +handle_option([{minimal_remote_max_packet_size, _} = Opt|Rest], SocketOptions, SshOptions) -> + handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, [handle_inet_option(Opt) | SocketOptions], SshOptions). + +handle_ssh_option({minimal_remote_max_packet_size, Value} = Opt) when is_integer(Value), Value >=0 -> + Opt; handle_ssh_option({system_dir, Value} = Opt) when is_list(Value) -> Opt; handle_ssh_option({user_dir, Value} = Opt) when is_list(Value) -> |