aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh.hrl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-05-03 13:48:39 +0200
committerHans Nilsson <[email protected]>2018-05-04 13:27:36 +0200
commit79e3c477f8d0d8ea397820847c576e0a0aaa5323 (patch)
treedb37dab735633c1c7c2b2ee5154e5e89eaa7b0d3 /lib/ssh/src/ssh.hrl
parenta8ede33f9a51c1566ccb38df0056c3e1f092b970 (diff)
downloadotp-79e3c477f8d0d8ea397820847c576e0a0aaa5323.tar.gz
otp-79e3c477f8d0d8ea397820847c576e0a0aaa5323.tar.bz2
otp-79e3c477f8d0d8ea397820847c576e0a0aaa5323.zip
ssh: Extend rekey_limit to also take an optional time
Diffstat (limited to 'lib/ssh/src/ssh.hrl')
-rw-r--r--lib/ssh/src/ssh.hrl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl
index a3d9a1b1cb..fc0a3786ac 100644
--- a/lib/ssh/src/ssh.hrl
+++ b/lib/ssh/src/ssh.hrl
@@ -29,7 +29,6 @@
-define(SSH_DEFAULT_PORT, 22).
-define(SSH_MAX_PACKET_SIZE, (256*1024)).
--define(REKEY_TIMOUT, 3600000).
-define(REKEY_DATA_TIMOUT, 60000).
-define(DEFAULT_PROFILE, default).
@@ -192,7 +191,9 @@
-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, non_neg_integer() }.
+-type rekey_limit_common_option() :: {rekey_limit, Bytes::non_neg_integer() |
+ {Minutes::non_neg_integer(), Bytes::non_neg_integer()}
+ }.
-type key_cb_common_option() :: {key_cb, Module::atom() | {Module::atom(),Opts::[term()]} } .
-type disconnectfun_common_option() ::