aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-06-12 09:51:19 +0200
committerErlang/OTP <[email protected]>2019-06-12 09:51:19 +0200
commit024c51bf0cd9050bf7171e0b3560c7c4ef846301 (patch)
tree3dc2f3dfad33b1e42157c1373efe8989ce469180 /lib/ssl/src
parent3af70ef223b832e34aa85bf7789e1795a0650825 (diff)
parent6692b1e347a6d843f11fe8117af1c1534a505085 (diff)
downloadotp-024c51bf0cd9050bf7171e0b3560c7c4ef846301.tar.gz
otp-024c51bf0cd9050bf7171e0b3560c7c4ef846301.tar.bz2
otp-024c51bf0cd9050bf7171e0b3560c7c4ef846301.zip
Merge branch 'ingela/ssl/dtls-multiplxor/ERL-962/OTP-15864' into maint-22
* ingela/ssl/dtls-multiplxor/ERL-962/OTP-15864: ssl: Add missing gen_server return value in DTLS packet demux process
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/dtls_packet_demux.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/dtls_packet_demux.erl b/lib/ssl/src/dtls_packet_demux.erl
index c6431b55a9..94b350eaa5 100644
--- a/lib/ssl/src/dtls_packet_demux.erl
+++ b/lib/ssl/src/dtls_packet_demux.erl
@@ -154,9 +154,9 @@ handle_info({Transport, Socket, IP, InPortNo, _} = Msg, #state{listener = Socket
handle_info({PassiveTag, Socket},
#state{active_n = N,
listener = Socket,
- transport = {_,_,_, udp_error, PassiveTag}}) ->
- next_datagram(Socket, N);
-
+ transport = {_, _, _, _, PassiveTag}} = State) ->
+ next_datagram(Socket, N),
+ {noreply, State};
%% 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!