[asterisk-commits] trunk - r8023 /trunk/channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Thu Jan 12 13:15:20 2006
New Revision: 8023

URL: http://svn.digium.com/view/asterisk?rev=8023&view=rev
Log:
Oops... need to keep my trunk folder clean...

Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=8023&r1=8022&r2=8023&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Jan 12 13:15:20 2006
@@ -2680,9 +2680,8 @@
 	switch(condition) {
 	case AST_CONTROL_RINGING:
 		if (ast->_state == AST_STATE_RING) {
-			if ((!ast_test_flag(p, SIP_PROGRESS_SENT) ||
-			    (ast_test_flag(p, SIP_PROG_INBAND) == SIP_PROG_INBAND_NEVER)) &&
-			    ast_test_flag(p, SIP_PROG_INBAND) != SIP_PROG_INBAND_YES) {				
+			if (!ast_test_flag(p, SIP_PROGRESS_SENT) ||
+			    (ast_test_flag(p, SIP_PROG_INBAND) == SIP_PROG_INBAND_NEVER)) {				
 				/* Send 180 ringing if out-of-band seems reasonable */
 				transmit_response(p, "180 Ringing", &p->initreq);
 				ast_set_flag(p, SIP_RINGING);