From 766d133c622fe34358e35231b0cb60c3283a68f9 Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Tue, 9 Oct 2012 21:35:53 +0000
Subject: [PATCH] Improve logging for DTLS-SRTP failure situations.
(closes issue ASTERISK-20487)
Reported by: mjordan
........
Merged revisions 374756 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374757 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index b938d2d81a..09fef2c990 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -5574,9 +5574,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",
+ 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;
}
--
GitLab