From e99bc5a149eaaaacb81a84a2d2608f9893242e5d Mon Sep 17 00:00:00 2001 From: Andreas Schultz Date: Wed, 4 May 2016 17:41:49 +0200 Subject: dtls: replace tls_record with RecordCB in connection_info Conflicts: lib/ssl/src/ssl_connection.erl --- lib/ssl/src/ssl_connection.erl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/ssl/src/ssl_connection.erl') 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). -- cgit v1.2.3