summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-02-07 12:22:52 +0000
committerSimon MacMullen <simon@rabbitmq.com>2011-02-07 12:22:52 +0000
commit25a2afa6379d638201dda02f49a52c043a879f91 (patch)
tree08eea62d9a1e92d909efb95f43809b3ecb7e3a2a /src
parent8d2705b0c206c90f8e83068c09aa3498bb638c1d (diff)
downloadrabbitmq-server-git-25a2afa6379d638201dda02f49a52c043a879f91.tar.gz
Keep the same formate as ssl:connection_info
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_reader.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 09fe74d051..8c7525d6f7 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) ->