aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-10-14 13:15:41 +0200
committerHans Nilsson <[email protected]>2016-10-14 14:42:12 +0200
commitd4caa3dfdb9182f4e3dd95641c7429cc893a371e (patch)
tree6983a9be9667c69732e755a3f46d1d450ec38651
parentdf8c6690a86d087d8de324276b2266bc5918c779 (diff)
downloadotp-d4caa3dfdb9182f4e3dd95641c7429cc893a371e.tar.gz
otp-d4caa3dfdb9182f4e3dd95641c7429cc893a371e.tar.bz2
otp-d4caa3dfdb9182f4e3dd95641c7429cc893a371e.zip
ftp: socket wrapper changed suddenly and erroneously
-rw-r--r--lib/inets/src/ftp/ftp.erl4
1 files changed, 3 insertions, 1 deletions
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),