aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/ftp/ftp.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2013-12-03 16:43:17 +0100
committerHans Nilsson <[email protected]>2013-12-03 16:43:17 +0100
commitd54105dc7549bc091e50737be91550d2892233a8 (patch)
treec1b45cd7ebf6abdb9f1728aa8d1053fad990dc0d /lib/inets/src/ftp/ftp.erl
parentd3abd236672cff39b371fe72f5412ae1b704c6df (diff)
parent9f997aadc86eb5620beb0d92777a8fdd1b95ab1b (diff)
downloadotp-d54105dc7549bc091e50737be91550d2892233a8.tar.gz
otp-d54105dc7549bc091e50737be91550d2892233a8.tar.bz2
otp-d54105dc7549bc091e50737be91550d2892233a8.zip
Merge branch 'maint'
Diffstat (limited to 'lib/inets/src/ftp/ftp.erl')
-rw-r--r--lib/inets/src/ftp/ftp.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl
index 86ef9280ad..520db1b457 100644
--- a/lib/inets/src/ftp/ftp.erl
+++ b/lib/inets/src/ftp/ftp.erl
@@ -2068,7 +2068,7 @@ setup_data_connection(#state{mode = active,
{ok, LSock} =
gen_tcp:listen(0, [{ip, IP}, {active, false},
inet6, binary, {packet, 0}]),
- {ok, {_, Port}} = sockname(LSock),
+ {ok, {_, Port}} = sockname({tcp,LSock}),
IpAddress = inet_parse:ntoa(IP),
Cmd = mk_cmd("EPRT |2|~s|~p|", [IpAddress, Port]),
send_ctrl_message(State, Cmd),
@@ -2351,8 +2351,8 @@ millisec_time() ->
peername({tcp, Socket}) -> inet:peername(Socket);
peername({ssl, Socket}) -> ssl:peername(Socket).
-sockname({tcp, Socket}) -> inet:peername(Socket);
-sockname({ssl, Socket}) -> ssl:peername(Socket).
+sockname({tcp, Socket}) -> inet:sockname(Socket);
+sockname({ssl, Socket}) -> ssl:sockname(Socket).
maybe_tls_upgrade(Pid, undefined) ->
{ok, Pid};