diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-08-30 17:33:33 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-08-30 17:40:42 +0200 |
| commit | 572fed38106ccd490352bceb3fcecb34f33f9e18 (patch) | |
| tree | 23b570b5dab57b14cebbd28a1590f3068f07ec49 /lib/ssl/src/dtls_socket.erl | |
| parent | 72f64e28866815f7621119997e02455e751d7d53 (diff) | |
| parent | 96aa684ffcae8f70898aa6b924fa82804d537488 (diff) | |
| download | otp-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/dtls_socket.erl')
| -rw-r--r-- | lib/ssl/src/dtls_socket.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ssl/src/dtls_socket.erl b/lib/ssl/src/dtls_socket.erl index b26d3ae41a..2001afd02f 100644 --- a/lib/ssl/src/dtls_socket.erl +++ b/lib/ssl/src/dtls_socket.erl @@ -48,7 +48,7 @@ accept(dtls, #config{transport_info = {Transport,_,_,_}, dtls_handler = {Listner, _}}, _Timeout) -> case dtls_packet_demux:accept(Listner, self()) of {ok, Pid, Socket} -> - {ok, socket(Pid, Transport, {Listner, Socket}, ConnectionCb)}; + {ok, socket([Pid], Transport, {Listner, Socket}, ConnectionCb)}; {error, Reason} -> {error, Reason} end. @@ -73,12 +73,12 @@ close(gen_udp, {_Client, _Socket}) -> close(Transport, {_Client, Socket}) -> Transport:close(Socket). -socket(Pid, gen_udp = Transport, {{_, _}, Socket}, ConnectionCb) -> - #sslsocket{pid = Pid, +socket(Pids, gen_udp = Transport, {{_, _}, Socket}, ConnectionCb) -> + #sslsocket{pid = Pids, %% "The name "fd" is keept for backwards compatibility fd = {Transport, Socket, ConnectionCb}}; -socket(Pid, Transport, Socket, ConnectionCb) -> - #sslsocket{pid = Pid, +socket(Pids, Transport, Socket, ConnectionCb) -> + #sslsocket{pid = Pids, %% "The name "fd" is keept for backwards compatibility fd = {Transport, Socket, ConnectionCb}}. setopts(_, #sslsocket{pid = {dtls, #config{dtls_handler = {ListenPid, _}}}}, Options) -> |