diff options
author | Hans Nilsson <[email protected]> | 2018-05-14 12:27:59 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-05-14 12:27:59 +0200 |
commit | 6454f3b15bd1c260017c250915d45ba77ee86c4f (patch) | |
tree | 9df5246535aa31228db20f396f626b0b9413841f /lib/ssh/src/ssh.hrl | |
parent | f97a29930f6a192d06c053ebd88d4abe7e45beb8 (diff) | |
parent | c9f0a6ed11d42d461aeb4f29e4b3c900df3fed98 (diff) | |
download | otp-6454f3b15bd1c260017c250915d45ba77ee86c4f.tar.gz otp-6454f3b15bd1c260017c250915d45ba77ee86c4f.tar.bz2 otp-6454f3b15bd1c260017c250915d45ba77ee86c4f.zip |
Merge branch 'hans/ssh/rekey_limit/OTP-15069'
* hans/ssh/rekey_limit/OTP-15069:
ssh: Test the infinity rekey_limit option
ssh: Add infinity as values to rekey_limit
Diffstat (limited to 'lib/ssh/src/ssh.hrl')
-rw-r--r-- | lib/ssh/src/ssh.hrl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index fc0a3786ac..2efd239aae 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -191,10 +191,13 @@ -type user_dir_common_option() :: {user_dir, false | string()}. -type profile_common_option() :: {profile, atom() }. -type max_idle_time_common_option() :: {idle_time, timeout()}. --type rekey_limit_common_option() :: {rekey_limit, Bytes::non_neg_integer() | - {Minutes::non_neg_integer(), Bytes::non_neg_integer()} +-type rekey_limit_common_option() :: {rekey_limit, Bytes::limit_bytes() | + {Minutes::limit_time(), Bytes::limit_bytes()} }. +-type limit_bytes() :: non_neg_integer() | infinity . % non_neg_integer due to compatibility +-type limit_time() :: pos_integer() | infinity . + -type key_cb_common_option() :: {key_cb, Module::atom() | {Module::atom(),Opts::[term()]} } . -type disconnectfun_common_option() :: {disconnectfun, fun((Reason::term()) -> void | any()) }. |