diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-02-07 12:22:52 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-02-07 12:22:52 +0000 |
| commit | 781ef3292b4c36f08074aec1d283e67895224aa8 (patch) | |
| tree | 08eea62d9a1e92d909efb95f43809b3ecb7e3a2a | |
| parent | 75622e319705ce12e9243ada85af2441af88fa4c (diff) | |
| download | rabbitmq-server-781ef3292b4c36f08074aec1d283e67895224aa8.tar.gz | |
Keep the same formate as ssl:connection_infobug23804
| -rw-r--r-- | src/rabbit_reader.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 09fe74d0..8c7525d6 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -864,13 +864,13 @@ i(peer_port, #v1{sock = Sock}) -> i(ssl, #v1{sock = Sock}) -> rabbit_net:is_ssl(Sock); i(ssl_protocol, #v1{sock = Sock}) -> - ssl_info(fun ({P, _, _, _}) -> P end, Sock); + ssl_info(fun ({P, _}) -> P end, Sock); i(ssl_key_exchange, #v1{sock = Sock}) -> - ssl_info(fun ({_, K, _, _}) -> K end, Sock); + ssl_info(fun ({_, {K, _, _}}) -> K end, Sock); i(ssl_cipher, #v1{sock = Sock}) -> - ssl_info(fun ({_, _, C, _}) -> C end, Sock); + ssl_info(fun ({_, {_, C, _}}) -> C end, Sock); i(ssl_hash, #v1{sock = Sock}) -> - ssl_info(fun ({_, _, _, H}) -> H end, Sock); + ssl_info(fun ({_, {_, _, H}}) -> H end, Sock); i(peer_cert_issuer, #v1{sock = Sock}) -> cert_info(fun rabbit_ssl:peer_cert_issuer/1, Sock); i(peer_cert_subject, #v1{sock = Sock}) -> @@ -928,8 +928,8 @@ ssl_info(F, Sock) -> case rabbit_net:ssl_info(Sock) of nossl -> ''; {error, _} -> ''; - {ok, {P, {K, C, H}}} -> F({P, K, C, H}); - {ok, {P, {K, C, H, _}}} -> F({P, K, C, H}) + {ok, {P, {K, C, H}}} -> F({P, {K, C, H}}); + {ok, {P, {K, C, H, _}}} -> F({P, {K, C, H}}) end. cert_info(F, Sock) -> |