diff options
| author | Péter Dimitrov <[email protected]> | 2019-04-01 13:20:32 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-04-01 13:20:32 +0200 |
| commit | be44d6827e2374a43068b35de85ed16441c771be (patch) | |
| tree | bc0618cbea4d80d2322f41ff4828efd8458289ba | |
| parent | b727bbf3632b4a31cfa2c7b284b5cecd0b542f35 (diff) | |
| parent | 8e7794883ec5ed54ed18ae33029036c0426f8d37 (diff) | |
| download | otp-be44d6827e2374a43068b35de85ed16441c771be.tar.gz otp-be44d6827e2374a43068b35de85ed16441c771be.tar.bz2 otp-be44d6827e2374a43068b35de85ed16441c771be.zip | |
Merge branch 'peterdmv/ssl/dtls-fix'
* peterdmv/ssl/dtls-fix:
ssl: Fix dtls queue handling
ssl: Fix retransmission timeout
Change-Id: Ic3312e46e56dca096318a5a6b2eefa6cc0e34863
| -rw-r--r-- | lib/ssl/src/dtls_connection.erl | 4 | ||||
| -rw-r--r-- | lib/ssl/src/dtls_packet_demux.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/dtls_connection.erl b/lib/ssl/src/dtls_connection.erl index a6943af164..7993be8a74 100644 --- a/lib/ssl/src/dtls_connection.erl +++ b/lib/ssl/src/dtls_connection.erl @@ -1077,10 +1077,10 @@ start_retransmision_timer(Timeout, #state{protocol_specific = PS} = State) -> {State#state{protocol_specific = PS#{flight_state => {retransmit, new_timeout(Timeout)}}}, [{state_timeout, Timeout, flight_retransmission_timeout}]}. -new_timeout(N) when N =< 30 -> +new_timeout(N) when N =< 30000 -> N * 2; new_timeout(_) -> - 60. + 60000. send_handshake_flight(#state{static_env = #static_env{socket = Socket, transport_cb = Transport}, diff --git a/lib/ssl/src/dtls_packet_demux.erl b/lib/ssl/src/dtls_packet_demux.erl index e0423b07b4..2e9184b7ac 100644 --- a/lib/ssl/src/dtls_packet_demux.erl +++ b/lib/ssl/src/dtls_packet_demux.erl @@ -203,9 +203,9 @@ dispatch(Client, Msg, #state{dtls_msq_queues = MsgQueues} = State) -> Pid ! Msg, State#state{dtls_msq_queues = kv_update(Client, Queue, MsgQueues)}; - {{value, _}, Queue} -> + {{value, _UDP}, _Queue} -> State#state{dtls_msq_queues = - kv_update(Client, queue:in(Msg, Queue), MsgQueues)}; + kv_update(Client, queue:in(Msg, Queue0), MsgQueues)}; {empty, Queue} -> State#state{dtls_msq_queues = kv_update(Client, queue:in(Msg, Queue), MsgQueues)} |