aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/tls_socket.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-08-30 17:33:33 +0200
committerIngela Anderton Andin <[email protected]>2018-08-30 17:40:42 +0200
commit572fed38106ccd490352bceb3fcecb34f33f9e18 (patch)
tree23b570b5dab57b14cebbd28a1590f3068f07ec49 /lib/ssl/src/tls_socket.erl
parent72f64e28866815f7621119997e02455e751d7d53 (diff)
parent96aa684ffcae8f70898aa6b924fa82804d537488 (diff)
downloadotp-572fed38106ccd490352bceb3fcecb34f33f9e18.tar.gz
otp-572fed38106ccd490352bceb3fcecb34f33f9e18.tar.bz2
otp-572fed38106ccd490352bceb3fcecb34f33f9e18.zip
Merge branch 'maint'
Conflicts: lib/ssl/src/ssl_connection.erl lib/ssl/src/tls_connection.erl
Diffstat (limited to 'lib/ssl/src/tls_socket.erl')
-rw-r--r--lib/ssl/src/tls_socket.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/ssl/src/tls_socket.erl b/lib/ssl/src/tls_socket.erl
index 154281f1c2..a391bc53de 100644
--- a/lib/ssl/src/tls_socket.erl
+++ b/lib/ssl/src/tls_socket.erl
@@ -64,11 +64,12 @@ accept(ListenSocket, #config{transport_info = {Transport,_,_,_} = CbInfo,
{ok, Socket} ->
{ok, EmOpts} = get_emulated_opts(Tracker),
{ok, Port} = tls_socket:port(Transport, Socket),
- ConnArgs = [server, "localhost", Port, Socket,
+ {ok, Sender} = tls_sender:start(),
+ ConnArgs = [server, Sender, "localhost", Port, Socket,
{SslOpts, emulated_socket_options(EmOpts, #socket_options{}), Tracker}, self(), CbInfo],
case tls_connection_sup:start_child(ConnArgs) of
{ok, Pid} ->
- ssl_connection:socket_control(ConnectionCb, Socket, Pid, Transport, Tracker);
+ ssl_connection:socket_control(ConnectionCb, Socket, [Pid, Sender], Transport, Tracker);
{error, Reason} ->
{error, Reason}
end;
@@ -112,8 +113,8 @@ connect(Address, Port,
{error, {options, {socket_options, UserOpts}}}
end.
-socket(Pid, Transport, Socket, ConnectionCb, Tracker) ->
- #sslsocket{pid = Pid,
+socket(Pids, Transport, Socket, ConnectionCb, Tracker) ->
+ #sslsocket{pid = Pids,
%% "The name "fd" is keept for backwards compatibility
fd = {Transport, Socket, ConnectionCb, Tracker}}.
setopts(gen_tcp, #sslsocket{pid = {ListenSocket, #config{emulated = Tracker}}}, Options) ->