From d4caa3dfdb9182f4e3dd95641c7429cc893a371e Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Fri, 14 Oct 2016 13:15:41 +0200 Subject: ftp: socket wrapper changed suddenly and erroneously --- lib/inets/src/ftp/ftp.erl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/inets/src') diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl index 8bad91bf98..2fc93b0f2a 100644 --- a/lib/inets/src/ftp/ftp.erl +++ b/lib/inets/src/ftp/ftp.erl @@ -2363,12 +2363,14 @@ activate_ctrl_connection(#state{csock = Socket, ctrl_data = {<<>>, _, _}}) -> activate_ctrl_connection(#state{csock = Socket}) -> %% We have already received at least part of the next control message, %% that has been saved in ctrl_data, process this first. - self() ! {tcp, unwrap_socket(Socket), <<>>}. + self() ! {socket_type(Socket), unwrap_socket(Socket), <<>>}. unwrap_socket({tcp,Socket}) -> Socket; unwrap_socket({ssl,Socket}) -> Socket; unwrap_socket(Socket) -> Socket. +socket_type({tcp,_Socket}) -> tcp; +socket_type({ssl,_Socket}) -> ssl. activate_data_connection(#state{dsock = Socket} = State) -> activate_connection(Socket), -- cgit v1.2.3 From 6394c0df8b1b593ca3c3799ef3a022517d9a730f Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Fri, 14 Oct 2016 15:44:02 +0200 Subject: ftp: added forgotten inet:setopts active once --- lib/inets/src/ftp/ftp.erl | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/inets/src') diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl index 2fc93b0f2a..39b3bada83 100644 --- a/lib/inets/src/ftp/ftp.erl +++ b/lib/inets/src/ftp/ftp.erl @@ -2361,6 +2361,7 @@ send_message({ssl, Socket}, Message) -> activate_ctrl_connection(#state{csock = Socket, ctrl_data = {<<>>, _, _}}) -> activate_connection(Socket); activate_ctrl_connection(#state{csock = Socket}) -> + activate_connection(Socket), %% We have already received at least part of the next control message, %% that has been saved in ctrl_data, process this first. self() ! {socket_type(Socket), unwrap_socket(Socket), <<>>}. -- cgit v1.2.3 From 2fa04b1a2b209c7e952eb931d6f5214dc2788390 Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Fri, 14 Oct 2016 13:22:48 +0200 Subject: ftp: New DBG alternative: ct:pal --- lib/inets/src/ftp/ftp.erl | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/inets/src') diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl index 39b3bada83..6868b75eff 100644 --- a/lib/inets/src/ftp/ftp.erl +++ b/lib/inets/src/ftp/ftp.erl @@ -108,6 +108,7 @@ -define(DBG(F,A), 'n/a'). %%-define(DBG(F,A), io:format(F,A)). +%%-define(DBG(F,A), if is_list(F) -> ct:pal(F,A); is_atom(F)->ct:pal(atom_to_list(F),A) end). %%%========================================================================= %%% API - CLIENT FUNCTIONS -- cgit v1.2.3