Merge branch 'hans/ssh/srcip/OTP-11339' into maint

* hans/ssh/srcip/OTP-11339:
  ssh: Add ssh:sockname/1 incl doc and tests
  ssh: Add function ssh:peername/1 with test

2 files changed, 40 insertions, 13 deletions

diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 7d5478c3f6..80d20abbbd 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -28,6 +28,8 @@
 -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,
+	 peername/1,
+	 sockname/1,
 	 stop_listener/1, stop_listener/2, stop_daemon/1, stop_daemon/2,
 	 shell/1, shell/2, shell/3]).
 
@@ -245,6 +247,28 @@ shell(Host, Port, Options) ->
     end.
 
 %%--------------------------------------------------------------------
+%% Function: peername(ConnectionRef) -> {ok, {Host,Port}}
+%%                                   |  {error,Error}
+%%
+%% Description: Returns the peer address of the connection
+%%--------------------------------------------------------------------
+peername(ConnectionRef) ->
+    [{peer, {_Name,{IP,Port}}}] =
+	ssh_connection_manager:connection_info(ConnectionRef, [peer]),
+    {ok, {IP,Port}}.
+
+%%--------------------------------------------------------------------
+%% Function: sockname(ConnectionRef) -> {ok, {Host,Port}}
+%%                                   |  {error,Error}
+%%
+%% Description: Returns the local address of the connection
+%%--------------------------------------------------------------------
+sockname(ConnectionRef) ->
+    [{sockname, Result}] =
+	ssh_connection_manager:connection_info(ConnectionRef, [sockname]),
+    Result.
+
+%%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
 fix_idle_time(SshOptions) ->
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 9de4dd5967..c3e8a3c742 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -46,7 +46,7 @@
 	 handle_sync_event/4, handle_info/3, terminate/3, code_change/4]).
 
 %% spawn export
--export([ssh_info_handler/3]).
+-export([ssh_info_handler/4]).
 
 -record(state, {
 	  transport_protocol,      % ex: tcp
@@ -533,7 +533,7 @@ handle_event(renegotiate, StateName, State) ->
     {next_state, StateName, State};
 
 handle_event({info, From, Options}, StateName,  #state{ssh_params = Ssh} = State) ->
-    spawn(?MODULE, ssh_info_handler, [Options, Ssh, From]), 
+    spawn(?MODULE, ssh_info_handler, [Options, Ssh, State, From]),
     {next_state, StateName, State};
 handle_event(data_size, connected, #state{ssh_params = Ssh0} = State) ->
     {ok, [{send_oct,Sent}]} = inet:getstat(State#state.socket, [send_oct]),
@@ -1022,26 +1022,29 @@ retry_fun(User, Reason, Opts) ->
 	    catch Fun(User, Reason)
     end.
 
-ssh_info_handler(Options, Ssh, From) ->
-    Info = ssh_info(Options, Ssh, []),
+ssh_info_handler(Options, Ssh, State, From) ->
+    Info = ssh_info(Options, Ssh, State, []),
     ssh_connection_manager:send_msg({channel_requst_reply, From, Info}).
 
-ssh_info([], _, Acc) ->
+ssh_info([], _, _, Acc) ->
     Acc;
 
 ssh_info([client_version | Rest], #ssh{c_vsn = IntVsn,
-				       c_version = StringVsn} = SshParams, Acc) ->
-    ssh_info(Rest, SshParams, [{client_version, {IntVsn, StringVsn}} | Acc]);
+				       c_version = StringVsn} = SshParams, State, Acc) ->
+    ssh_info(Rest, SshParams, State, [{client_version, {IntVsn, StringVsn}} | Acc]);
 
 ssh_info([server_version | Rest], #ssh{s_vsn = IntVsn,
-				       s_version = StringVsn} = SshParams, Acc) ->
-    ssh_info(Rest, SshParams, [{server_version, {IntVsn, StringVsn}} | Acc]);
+				       s_version = StringVsn} = SshParams, State, Acc) ->
+    ssh_info(Rest, SshParams, State, [{server_version, {IntVsn, StringVsn}} | Acc]);
 
-ssh_info([peer | Rest], #ssh{peer = Peer} = SshParams, Acc) ->
-    ssh_info(Rest, SshParams, [{peer, Peer} | Acc]);
+ssh_info([peer | Rest], #ssh{peer = Peer} = SshParams, State, Acc) ->
+    ssh_info(Rest, SshParams, State, [{peer, Peer} | Acc]);
 
-ssh_info([ _ | Rest], SshParams, Acc) ->
-    ssh_info(Rest, SshParams, Acc).
+ssh_info([sockname | Rest], SshParams, #state{socket=Socket}=State, Acc) ->
+    ssh_info(Rest, SshParams, State, [{sockname,inet:sockname(Socket)}|Acc]);
+
+ssh_info([ _ | Rest], SshParams, State, Acc) ->
+    ssh_info(Rest, SshParams, State, Acc).
 
 log_error(Reason) ->
     Report = io_lib:format("Erlang ssh connection handler failed with reason: "