Author: mjordan Date: Wed Feb 25 17:05:40 2015 New Revision: 432279 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=432279 Log: 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 Modified: trunk/ (props changed) trunk/channels/chan_sip.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/channels/chan_sip.c URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=432279&r1=432278&r2=432279 ============================================================================== --- trunk/channels/chan_sip.c (original) +++ trunk/channels/chan_sip.c Wed Feb 25 17:05:40 2015 @@ -10549,7 +10549,7 @@ } 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 @@ } 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; } -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits