aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schultz <[email protected]>2016-05-04 17:41:49 +0200
committerIngela Anderton Andin <[email protected]>2016-09-05 14:37:25 +0200
commite99bc5a149eaaaacb81a84a2d2608f9893242e5d (patch)
tree3a55b8a42e3f9c2e0e263436ab1d29ab49a61bfd
parentfe4b387eddd182d6f0f3d57966186fc8c51bd64c (diff)
downloadotp-e99bc5a149eaaaacb81a84a2d2608f9893242e5d.tar.gz
otp-e99bc5a149eaaaacb81a84a2d2608f9893242e5d.tar.bz2
otp-e99bc5a149eaaaacb81a84a2d2608f9893242e5d.zip
dtls: replace tls_record with RecordCB in connection_info
Conflicts: lib/ssl/src/ssl_connection.erl
-rw-r--r--lib/ssl/src/ssl_connection.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 8a990870e8..6162915845 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -1054,8 +1054,11 @@ format_status(terminate, [_, StateName, State]) ->
%%--------------------------------------------------------------------
connection_info(#state{sni_hostname = SNIHostname,
session = #session{cipher_suite = CipherSuite},
- negotiated_version = Version, ssl_options = Opts}) ->
- [{protocol, tls_record:protocol_version(Version)},
+ protocol_cb = Connection,
+ negotiated_version = {_,_} = Version,
+ ssl_options = Opts}) ->
+ RecordCB = record_cb(Connection),
+ [{protocol, RecordCB:protocol_version(Version)},
{cipher_suite, ssl_cipher:erl_suite_definition(CipherSuite)},
{sni_hostname, SNIHostname}] ++ ssl_options_list(Opts).