Improve logging for DTLS-SRTP failure situations.

(closes issue ASTERISK-20487)
Reported by: mjordan

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@374756 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4f7e151dda476bee6b562fc77e6996dd36a74422..eaa19e72bca6ee51749b05c181ee6b33f404a04c 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -5531,11 +5531,21 @@ static int dialog_initialize_dtls_srtp(const struct sip_pvt *dialog, struct ast_
                return -1;
        }
 
-       if (!(dtls = ast_rtp_instance_get_dtls(rtp)) ||
-           dtls->set_configuration(rtp, &dialog->dtls_cfg) ||
-           !(*srtp = sip_srtp_alloc())) {
+       if (!(dtls = ast_rtp_instance_get_dtls(rtp))) {
                ast_log(LOG_ERROR, "No DTLS-SRTP support present on engine for RTP instance '%p', was it compiled with support for it?\n",
-                       instance);
+                       rtp);
+               return -1;
+       }
+
+       if (dtls->set_configuration(rtp, &dialog->dtls_cfg)) {
+               ast_log(LOG_ERROR, "Attempted to set an invalid DTLS-SRTP configuration on RTP instance '%p'\n",
+                       rtp);
+               return -1;
+       }
+
+       if (!(*srtp = sip_srtp_alloc())) {
+               ast_log(LOG_ERROR, "Failed to create required SRTP structure on RTP instance '%p'\n",
+                       rtp);
                return -1;
        }