[asterisk-commits] twilson: branch group/srtp_reboot r250242 - /team/group/srtp_reboot/channels/

[SVN commits to the Asterisk project]

Author: twilson
Date: Tue Mar  2 18:17:34 2010
New Revision: 250242

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=250242
Log:
Don't do packet2packet bridging if we are using SRTP!

Modified:
    team/group/srtp_reboot/channels/chan_sip.c

Modified: team/group/srtp_reboot/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/srtp_reboot/channels/chan_sip.c?view=diff&rev=250242&r1=250241&r2=250242
==============================================================================
--- team/group/srtp_reboot/channels/chan_sip.c (original)
+++ team/group/srtp_reboot/channels/chan_sip.c Tue Mar  2 18:17:34 2010
@@ -24576,7 +24576,7 @@
 
 	if (ast_test_flag(&p->flags[0], SIP_DIRECT_MEDIA | SIP_DIRECT_MEDIA_NAT)) {
                 res = AST_RTP_GLUE_RESULT_REMOTE;
-	} else if (ast_test_flag(&global_jbconf, AST_JB_FORCED)) {
+	} else if (ast_test_flag(&global_jbconf, AST_JB_FORCED) || p->srtp) {
                 res = AST_RTP_GLUE_RESULT_FORBID;
 	}