[asterisk-commits] moy: branch moy/mfcr2 r115161 - /team/moy/mfcr2/channels/chan_zap.c

[SVN commits to the Asterisk project]

Author: moy
Date: Thu May  1 22:03:20 2008
New Revision: 115161

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115161
Log:
Ignore ZT_EVENT_DIALCOMPLETE when R2 call is being setup. Fixes issue of missing RING state

Modified:
    team/moy/mfcr2/channels/chan_zap.c

Modified: team/moy/mfcr2/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2/channels/chan_zap.c?view=diff&rev=115161&r1=115160&r2=115161
==============================================================================
--- team/moy/mfcr2/channels/chan_zap.c (original)
+++ team/moy/mfcr2/channels/chan_zap.c Thu May  1 22:03:20 2008
@@ -4859,6 +4859,11 @@
 				tone_zone_play_tone(p->subs[index].zfd, -1);
 			break;	
 		case ZT_EVENT_DIALCOMPLETE:
+			if ((p->sig & SIG_MFCR2) && p->r2chan && ast->_state != AST_STATE_UP) {
+				/* we don't need to do anything for this event for R2 signaling 
+				   if the call is being setup */
+				break;
+			}
 			if (p->inalarm) break;
 			if ((p->radio || (p->oprmode < 0))) break;
 			if (ioctl(p->subs[index].zfd,ZT_DIALING,&x) == -1) {