From 25f7f974b9ecfcdedd0e8106948b40b6a3f89070 Mon Sep 17 00:00:00 2001 From: Evgeniy Khramtsov Date: Thu, 23 Nov 2017 11:09:40 +0300 Subject: [PATCH] Use ejabberd_pkix API in mod_sip --- src/mod_sip_proxy.erl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl index d600da3d0..47cd64263 100644 --- a/src/mod_sip_proxy.erl +++ b/src/mod_sip_proxy.erl @@ -270,11 +270,16 @@ cancel_pending_transactions(State) -> lists:foreach(fun esip:cancel/1, State#state.tr_ids). add_certfile(LServer, Opts) -> - case ejabberd_config:get_option({domain_certfile, LServer}) of - CertFile when is_binary(CertFile), CertFile /= <<"">> -> + case ejabberd_pkix:get_certfile(LServer) of + {ok, CertFile} -> [{certfile, CertFile}|Opts]; - _ -> - Opts + error -> + case ejabberd_config:get_option({domain_certfile, LServer}) of + CertFile when is_binary(CertFile) -> + [{certfile, CertFile}|Opts]; + _ -> + Opts + end end. add_via(#sip_socket{type = Transport}, LServer, #sip{hdrs = Hdrs} = Req) ->