aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-02-05 14:50:21 +0100
committerIngela Anderton Andin <[email protected]>2019-02-05 14:50:21 +0100
commita1dacff6a68d905b7620debfbdd401e50fad869e (patch)
tree07492870c915450be5fc7bd2ff4677df3a93e0fb
parentb887f5ac090ee802201552fc7dcdee04e20f93e8 (diff)
parenta50f764e5c015f573197aa887242c30430b9d186 (diff)
downloadotp-a1dacff6a68d905b7620debfbdd401e50fad869e.tar.gz
otp-a1dacff6a68d905b7620debfbdd401e50fad869e.tar.bz2
otp-a1dacff6a68d905b7620debfbdd401e50fad869e.zip
Merge branch 'ingela/ssl/dtls-match-error/OTP-15561' into maint
* ingela/ssl/dtls-match-error/OTP-15561: ssl: Remove unintended match
-rw-r--r--lib/ssl/src/dtls_packet_demux.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/dtls_packet_demux.erl b/lib/ssl/src/dtls_packet_demux.erl
index 1497c77cf3..dccc22a448 100644
--- a/lib/ssl/src/dtls_packet_demux.erl
+++ b/lib/ssl/src/dtls_packet_demux.erl
@@ -144,11 +144,11 @@ handle_info({Transport, Socket, IP, InPortNo, _} = Msg, #state{listener = Socket
%% UDP socket does not have a connection and should not receive an econnreset
%% This does however happens on some windows versions. Just ignoring it
%% appears to make things work as expected!
-handle_info({Error, Socket, econnreset = Error}, #state{listener = Socket, transport = {_,_,_, udp_error}} = State) ->
+handle_info({udp_error, Socket, econnreset = Error}, #state{listener = Socket, transport = {_,_,_, udp_error}} = State) ->
Report = io_lib:format("Ignore SSL UDP Listener: Socket error: ~p ~n", [Error]),
error_logger:info_report(Report),
{noreply, State};
-handle_info({Error, Socket, Error}, #state{listener = Socket, transport = {_,_,_, Error}} = State) ->
+handle_info({ErrorTag, Socket, Error}, #state{listener = Socket, transport = {_,_,_, ErrorTag}} = State) ->
Report = io_lib:format("SSL Packet muliplxer shutdown: Socket error: ~p ~n", [Error]),
error_logger:info_report(Report),
{noreply, State#state{close=true}};