From 4b63da7f7dbfd6e2d8290ca736c47bffe182d691 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Wed, 25 Feb 2015 23:05:40 +0000 Subject: [PATCH] channels/chan_sip: Clarify WARNING message in mismatched SRTP scenario When we receive an SDP as part of an offer/answer for a peer/friend has been configured to require encryption, and that SDP offer/answer failed to provide acceptable crypto attributes, we currently issue a WARNING that uses the phrase "we" and "requested". In this case, both of those terms are ambiguous - the user will probably think "we" is Asterisk (it most likely isn't) and it may not be a "request", so much as an SDP that was received in some fashion. This patch makes the WARNING messages slightly less bad and a bit more accurate as well. ASTERISK-23214 #close Reported by: Rusty Newton ........ Merged revisions 432277 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 432278 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@432279 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index f132cdda44..c743e0f426 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10549,7 +10549,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action } if (!secure_audio && p->srtp) { - ast_log(LOG_WARNING, "We are requesting SRTP for audio, but they responded without it!\n"); + ast_log(LOG_WARNING, "Failed to receive SDP offer/answer with required SRTP crypto attributes for audio\n"); res = -1; goto process_sdp_cleanup; } @@ -10561,7 +10561,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action } if (!p->novideo && !secure_video && p->vsrtp) { - ast_log(LOG_WARNING, "We are requesting SRTP for video, but they responded without it!\n"); + ast_log(LOG_WARNING, "Failed to receive SDP offer/answer with required SRTP crypto attributes for video\n"); res = -1; goto process_sdp_cleanup; }