[Asterisk-cvs] asterisk/channels chan_sip.c,1.562,1.563

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv2160/channels

Modified Files:
	chan_sip.c 
Log Message:
Send 180 ringing even if we're going to send in-band if we're still in RING state...


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -d -r1.562 -r1.563
--- chan_sip.c	13 Nov 2004 16:22:44 -0000	1.562
+++ chan_sip.c	14 Nov 2004 14:54:54 -0000	1.563
@@ -1900,13 +1900,16 @@
 	switch(condition) {
 	case AST_CONTROL_RINGING:
 		if (ast->_state == AST_STATE_RING) {
+			/* Send 180 ringing no matter what */
+			transmit_response(p, "180 Ringing", &p->initreq);
 			if (!p->progress) {
-				transmit_response(p, "180 Ringing", &p->initreq);
 				p->ringing = 1;
 				if (!p->progressinband)
 					break;
 			} else {
-				/* Oops, we've sent progress tones.  Let Asterisk do it instead */
+				/* Oops, we've sent progress tones.  Some devices don't seem to
+				   handle a 180 after a 183, so we'll go ahead and send the
+				   ringback in-band, too. */
 			}
 		}
 		return -1;