From 1cc5affef1dee69e5cb4b7d4aca0465e1072d4d9 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 30 Mar 2017 17:17:34 +0200
Subject: ssh: idle_timer on daemon - implementation

---
 lib/ssh/src/ssh_connection_handler.erl |  8 +++++++-
 lib/ssh/src/ssh_options.erl            | 12 ++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index b9c643c77e..15a05a1b85 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -400,7 +400,9 @@ init_process_state(Role, Socket, Opts) ->
 	    timer:apply_after(?REKEY_DATA_TIMOUT, gen_statem, cast, [self(), data_size]),
 	    cache_init_idle_timer(D);
 	server ->
-	    D#data{connection_state = init_connection(Role, C, Opts)}
+            cache_init_idle_timer(
+              D#data{connection_state = init_connection(Role, C, Opts)}
+             )
     end.
 
 
@@ -919,6 +921,9 @@ handle_event(internal, Msg=#ssh_msg_channel_extended_data{},     StateName, D) -
 handle_event(internal, Msg=#ssh_msg_channel_eof{},               StateName, D) ->
     handle_connection_msg(Msg, StateName, D);
 
+handle_event(internal, Msg=#ssh_msg_channel_close{},  {connected,server} = StateName, D) ->
+    handle_connection_msg(Msg, StateName, cache_request_idle_timer_check(D));
+
 handle_event(internal, Msg=#ssh_msg_channel_close{},             StateName, D) ->
     handle_connection_msg(Msg, StateName, D);
 
@@ -1280,6 +1285,7 @@ handle_event(info, {'EXIT', _Sup, Reason}, _, _) ->
     {stop, {shutdown, Reason}};
 
 handle_event(info, check_cache, _, D) ->
+ct:pal("check_cache",[]),
     {keep_state, cache_check_set_idle_timer(D)};
 
 handle_event(info, UnexpectedMessage, StateName, D = #data{ssh_params = Ssh}) ->
diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl
index a882a01eaf..55f9c6bdc8 100644
--- a/lib/ssh/src/ssh_options.erl
+++ b/lib/ssh/src/ssh_options.erl
@@ -490,12 +490,6 @@ default(client) ->
             class => user_options
            },
 
-      {idle_time, def} =>
-          #{default => infinity,
-            chk => fun check_timeout/1,
-            class => user_options
-           },
-
 %%%%% Undocumented
       {keyboard_interact_fun, def} =>
           #{default => undefined,
@@ -548,6 +542,12 @@ default(common) ->
              class => user_options
             },
 
+      {idle_time, def} =>
+          #{default => infinity,
+            chk => fun check_timeout/1,
+            class => user_options
+           },
+
        %% This is a "SocketOption"...
        %% {fd, def} =>
        %%     #{default => undefined,
-- 
cgit v1.2.3