From dd11ed82d7a0f2a8d8e29d6a07843358e7f347ff Mon Sep 17 00:00:00 2001 From: Evgeniy Khramtsov Date: Wed, 8 Mar 2017 08:27:54 +0300 Subject: [PATCH] Report more TLS errors --- src/ejabberd_c2s.erl | 3 +-- src/ejabberd_s2s_in.erl | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 1b7bac130..13e685022 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -276,8 +276,7 @@ process_terminated(#{sockmod := SockMod, socket := Socket, jid := JID} = State, bounce_message_queue(), State1; process_terminated(#{sockmod := SockMod, socket := Socket, - stop_reason := {tls, no_certfile}} = State, Reason) -> - %% TODO: we probably need to report more TLS errors here + stop_reason := {tls, _}} = State, Reason) -> ?ERROR_MSG("(~s) Failed to secure c2s connection: ~s", [SockMod:pp(Socket), format_reason(State, Reason)]), State; diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 1cddfec69..1a25ee7b9 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -288,8 +288,7 @@ handle_info(Info, #{server_host := LServer} = State) -> terminate(Reason, #{auth_domains := AuthDomains, sockmod := SockMod, socket := Socket} = State) -> case maps:get(stop_reason, State, undefined) of - {tls, no_certfile} = Err -> - %% TODO: we probably need to report more TLS errors here + {tls, _} = Err -> ?ERROR_MSG("(~s) Failed to secure inbound s2s connection: ~s", [SockMod:pp(Socket), xmpp_stream_in:format_error(Err)]); _ ->