From 6c4df2c7041c7fc139ab4f041a0e6f76b843a03d Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Wed, 25 Feb 2015 23:02:17 +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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@432277 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 bdf587e177..421fc3003e 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10420,7 +10420,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; } @@ -10432,7 +10432,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; }