diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-08-24 10:23:29 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-08-24 10:23:29 +0200 |
| commit | ed70ed1cbcfb01a8fee4ceac83c47afd78777387 (patch) | |
| tree | ae904a247a79e13b2a89b46bbf6e4583c43a97e3 /lib/ssl/src/dtls_socket.erl | |
| parent | 710f9437498a8a9df62a6c7cecd6eb632561754b (diff) | |
| parent | 56f6f1829e1f3fd3752914b302276bc9bf490bbb (diff) | |
| download | otp-ed70ed1cbcfb01a8fee4ceac83c47afd78777387.tar.gz otp-ed70ed1cbcfb01a8fee4ceac83c47afd78777387.tar.bz2 otp-ed70ed1cbcfb01a8fee4ceac83c47afd78777387.zip | |
Merge branch 'ingela/ssl/tls-vs-dtls-version' into maint
* ingela/ssl/tls-vs-dtls-version:
ssl: DTLS packet support
ssl: Enable dtls tests
ssl: Adjust ALPN and next protocol to work with DTLS
ssl: Enable more DTLS tests
ssl: negotiated_hashsign/4 expects TLS version to function correctly
Diffstat (limited to 'lib/ssl/src/dtls_socket.erl')
| -rw-r--r-- | lib/ssl/src/dtls_socket.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssl/src/dtls_socket.erl b/lib/ssl/src/dtls_socket.erl index fbbd479428..5f854fbb4b 100644 --- a/lib/ssl/src/dtls_socket.erl +++ b/lib/ssl/src/dtls_socket.erl @@ -137,7 +137,7 @@ internal_inet_values() -> [{active, false}, {mode,binary}]. default_inet_values() -> - [{active, true}, {mode, list}]. + [{active, true}, {mode, list}, {packet, 0}, {packet_size, 0}]. default_cb_info() -> {gen_udp, udp, udp_closed, udp_error}. @@ -149,8 +149,12 @@ get_emulated_opts(EmOpts, EmOptNames) -> emulated_socket_options(InetValues, #socket_options{ mode = Mode, + packet = Packet, + packet_size = PacketSize, active = Active}) -> #socket_options{ mode = proplists:get_value(mode, InetValues, Mode), + packet = proplists:get_value(packet, InetValues, Packet), + packet_size = proplists:get_value(packet_size, InetValues, PacketSize), active = proplists:get_value(active, InetValues, Active) }. |