From ebcece7f317f6d4e4d580c1f5629f4f46defe272 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 9 May 2018 11:42:49 +0200
Subject: ssh: Add infinity as values to rekey_limit

Zero is removed from the Minutes in the new tuple value to remove a loop possibility.  The zero is kept for bytes since that is not dangerous and a removal would be an unnecssary incompatibility.
---
 lib/ssh/src/ssh.hrl         |  7 +++++--
 lib/ssh/src/ssh_options.erl | 21 +++++++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'lib/ssh/src')

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()) }.
diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl
index 73287e464a..fe95d2ac54 100644
--- a/lib/ssh/src/ssh_options.erl
+++ b/lib/ssh/src/ssh_options.erl
@@ -601,14 +601,19 @@ default(common) ->
 
       {rekey_limit, def} =>
           #{default => {3600000, 1024000000}, % {1 hour, 1 GB}
-            chk => fun({TimeMins, SizBytes}) when is_integer(TimeMins) andalso TimeMins>=0,
-                                                  is_integer(SizBytes) andalso SizBytes>=0 ->
-                           %% New (>= 21) format
-                           {true, {TimeMins * 60*1000, % To ms
-                                   SizBytes}};
-                      (SizBytes) when is_integer(SizBytes) andalso SizBytes>=0 ->
-                           %% Old (< 21) format
-                           {true, {3600000, SizBytes}};
+            chk => fun({infinity, infinity}) ->
+                           true;
+                      ({Mins, infinity}) when is_integer(Mins), Mins>0 ->
+                           {true, {Mins*60*1000, infinity}};
+                      ({infinity, Bytes}) when is_integer(Bytes), Bytes>=0 ->
+                           true;
+                      ({Mins, Bytes}) when is_integer(Mins), Mins>0,
+                                           is_integer(Bytes), Bytes>=0 ->
+                           {true, {Mins*60*1000, Bytes}};
+                      (infinity) ->
+                           {true, {3600000, infinity}};
+                      (Bytes) when is_integer(Bytes), Bytes>=0 ->
+                           {true, {3600000, Bytes}};
                       (_) ->
                            false
                    end,
-- 
cgit v1.2.3