From 3f588941ec05bc69f4bd2ba76c391825f702338e Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Thu, 11 Apr 2019 15:50:54 +0200 Subject: ssh: Add ssh_channel:init/1 that was misstakeingly lost when introducing ssh_client_channel.erl --- lib/ssh/src/ssh_channel.erl | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/ssh/src') diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl index 443bd05086..1d977e3bc9 100644 --- a/lib/ssh/src/ssh_channel.erl +++ b/lib/ssh/src/ssh_channel.erl @@ -58,6 +58,7 @@ State::term()}. %%% API -export([start/4, start/5, start_link/4, start_link/5, call/2, call/3, + init/1, cast/2, reply/2, enter_loop/1]). %%==================================================================== @@ -76,6 +77,9 @@ cast(ChannelPid, Msg) -> reply(From, Msg) -> ssh_client_channel:reply(From, Msg). +init(Args) -> + ssh_client_channel:init(Args). + start(ConnectionManager, ChannelId, CallBack, CbInitArgs) -> ssh_client_channel:start(ConnectionManager, ChannelId, CallBack, CbInitArgs). -- cgit v1.2.3 From 10f9c216a5736f0861185be619774cb7fea9c0ef Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Thu, 11 Apr 2019 16:04:02 +0200 Subject: ssh: Present peername for accept_callback fun also for Sockets --- lib/ssh/src/ssh.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssh/src') diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index 5f5ccee4f8..a67a9a15e8 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -109,7 +109,7 @@ connect(Socket, UserOptions, Timeout) when is_port(Socket), Options -> case valid_socket_to_use(Socket, ?GET_OPT(transport,Options)) of ok -> - {ok, {Host,_Port}} = inet:sockname(Socket), + {ok, {Host,_Port}} = inet:peername(Socket), Opts = ?PUT_INTERNAL_OPT([{user_pid,self()}, {host,Host}], Options), ssh_connection_handler:start_connection(client, Socket, Opts, Timeout); {error,SockError} -> -- cgit v1.2.3