Changes after ssh-1.1.8

5 files changed, 31 insertions, 13 deletions

diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 5329373862..8f4b46051d 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,7 +19,15 @@
 
 {"%VSN%",	
  [
-  {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []}]},
+  {"1.1.8", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []},
+             {load_module, ssh, soft_purge, soft_purge, []},
+             {load_module, ssh_cli, soft_purge, soft_purge, []},
+             {load_module, ssh_connection, soft_purge, soft_purge, []}]},
+  {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+             {load_module, ssh_connection, soft_purge, soft_purge, []},
+             {load_module, ssh, soft_purge, soft_purge, []},
+             {load_module, ssh_cli, soft_purge, soft_purge, []},
+             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
   {"1.1.6", [{restart_application, ssh}]},
   {"1.1.5", [{restart_application, ssh}]},
   {"1.1.4", [{restart_application, ssh}]},
@@ -27,7 +35,15 @@
   {"1.1.2", [{restart_application, ssh}]}
  ],
  [
-  {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []}]},
+  {"1.1.8", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []},
+             {load_module, ssh, soft_purge, soft_purge, []},
+             {load_module, ssh_cli, soft_purge, soft_purge, []},
+             {load_module, ssh_connection, soft_purge, soft_purge, []}]},
+  {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+             {load_module, ssh_connection, soft_purge, soft_purge, []},
+             {load_module, ssh, soft_purge, soft_purge, []},
+             {load_module, ssh_cli, soft_purge, soft_purge, []},
+             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
   {"1.1.6", [{restart_application, ssh}]},
   {"1.1.5", [{restart_application, ssh}]},
   {"1.1.4", [{restart_application, ssh}]},
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 1e98e3d930..994c77436a 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -24,7 +24,7 @@
 -include("ssh.hrl").
 -include("ssh_connect.hrl").
 
--export([start/0, start/1, stop/0, connect/3, close/1, connection_info/2,
+-export([start/0, start/1, stop/0, connect/3, connect/4, close/1, connection_info/2,
 	 channel_info/3,
 	 daemon/1, daemon/2, daemon/3,
 	 stop_listener/1, stop_listener/2, stop_daemon/1, stop_daemon/2,
@@ -330,10 +330,10 @@ handle_options([{nodelay, _} = Opt | Rest], SockOpts, Opts) ->
 handle_options([Opt | Rest], SockOpts, Opts) ->
     handle_options(Rest, SockOpts, [Opt | Opts]).
 
+%% Has IPv6 been disabled?
 inetopt(true) ->
-    inet6;
-
+    inet;
 inetopt(false) ->
-    inet.
+    inet6.
 
 
diff --git a/lib/ssh/src/ssh_cli.erl b/lib/ssh/src/ssh_cli.erl
index beff6455d1..2764ea2e43 100644
--- a/lib/ssh/src/ssh_cli.erl
+++ b/lib/ssh/src/ssh_cli.erl
@@ -428,7 +428,7 @@ start_shell(ConnectionManager, State) ->
 			       {ok, User} = 
 				   ssh_userreg:lookup_user(ConnectionManager),
 			       {ok, PeerAddr} = 
-				   ssh_cm:get_peer_addr(ConnectionManager),
+				   ssh_connection_manager:peer_addr(ConnectionManager),
 			       fun() -> Shell(User, PeerAddr) end;
 			   _ ->
 			       Shell
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index 9fb7d7ac01..b9827c90ea 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -123,6 +123,8 @@ send(ConnectionManager, ChannelId, Data) ->
     send(ConnectionManager, ChannelId, 0, Data, infinity).
 send(ConnectionManager, ChannelId, Data, TimeOut) when is_integer(TimeOut) ->
     send(ConnectionManager, ChannelId, 0, Data, TimeOut);
+send(ConnectionManager, ChannelId, Data, infinity) ->
+    send(ConnectionManager, ChannelId, 0, Data, infinity);
 send(ConnectionManager, ChannelId, Type, Data) ->
     send(ConnectionManager, ChannelId, Type, Data, infinity).
 send(ConnectionManager, ChannelId, Type, Data, TimeOut) ->
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
index 7f0993a5b7..a2effc177e 100644
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ b/lib/ssh/src/ssh_connection_manager.erl
@@ -272,18 +272,18 @@ handle_call({ssh_msg, Pid, Msg}, From,
 	    {stop, normal, State#state{connection_state = Connection}}
 	catch
 	exit:{noproc, Reason} ->
-	    Report = io_lib:format("Connection probably terminated:~n~p~n~p~n",
-				   [ConnectionMsg, Reason]),
+	    Report = io_lib:format("Connection probably terminated:~n~p~n~p~n~p~n",
+				   [ConnectionMsg, Reason, erlang:get_stacktrace()]),
 	    error_logger:info_report(Report),
             {noreply, State};
 	error:Error ->
-	    Report = io_lib:format("Connection message returned:~n~p~n~p~n",
-				   [ConnectionMsg, Error]),
+	    Report = io_lib:format("Connection message returned:~n~p~n~p~n~p~n",
+				   [ConnectionMsg, Error, erlang:get_stacktrace()]),
 	    error_logger:info_report(Report),
 	    {noreply, State};
 	exit:Exit ->
-	    Report = io_lib:format("Connection message returned:~n~p~n~p~n",
-				   [ConnectionMsg, Exit]),
+	    Report = io_lib:format("Connection message returned:~n~p~n~p~n~p~n",
+				   [ConnectionMsg, Exit, erlang:get_stacktrace()]),
 	    error_logger:info_report(Report),
 	    {noreply, State}
     end;