diff options
author | Raimo Niskanen <[email protected]> | 2019-02-22 11:05:48 +0100 |
---|---|---|
committer | Raimo Niskanen <[email protected]> | 2019-02-22 11:10:57 +0100 |
commit | 73587632918cefc05d4112db74548b6770b35f9c (patch) | |
tree | 4fe3c92f40782dccb624160a8e671be113b4922d /lib/ssl/src/dtls_packet_demux.erl | |
parent | 9e9884640b7d0ee69cd39909842ec5fc8826859f (diff) | |
parent | 59c1634e7972746ab3f144bbd65922bcb1d9c630 (diff) | |
download | otp-73587632918cefc05d4112db74548b6770b35f9c.tar.gz otp-73587632918cefc05d4112db74548b6770b35f9c.tar.bz2 otp-73587632918cefc05d4112db74548b6770b35f9c.zip |
Merge branch ssl-active-n of essen:erlang/otp into essen/ssl-active-n
* essen:erlang/otp:
fixup! ssl: Add support for {active,N}
ssl: Use common fonction to update {active,N}
ssl: Document {active,N}
ssl: Add support for {active,N}
Conflicts:
lib/ssl/src/ssl_connection.erl
Diffstat (limited to 'lib/ssl/src/dtls_packet_demux.erl')
-rw-r--r-- | lib/ssl/src/dtls_packet_demux.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssl/src/dtls_packet_demux.erl b/lib/ssl/src/dtls_packet_demux.erl index dccc22a448..092366b7c0 100644 --- a/lib/ssl/src/dtls_packet_demux.erl +++ b/lib/ssl/src/dtls_packet_demux.erl @@ -297,6 +297,9 @@ do_set_emulated_opts([], Opts) -> Opts; do_set_emulated_opts([{mode, Value} | Rest], Opts) -> do_set_emulated_opts(Rest, Opts#socket_options{mode = Value}); +do_set_emulated_opts([{active, N0} | Rest], Opts=#socket_options{active = Active}) when is_integer(N0) -> + N = tls_socket:update_active_n(N0, Active), + do_set_emulated_opts(Rest, Opts#socket_options{active = N}); do_set_emulated_opts([{active, Value} | Rest], Opts) -> do_set_emulated_opts(Rest, Opts#socket_options{active = Value}). |