[Asterisk-cvs] asterisk/channels chan_zap.c,1.101,1.102

[martinp at lists.digium.com]

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

Modified Files:
	chan_zap.c 
Log Message:
Don't do callprogress on incoming calls -> that used to put that call in a wierd state 6 and the call is not answered.


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- chan_zap.c	25 Sep 2003 06:14:38 -0000	1.101
+++ chan_zap.c	26 Sep 2003 17:28:57 -0000	1.102
@@ -2660,7 +2660,7 @@
 				zt_enable_ec(p);
 				p->dialing = 0;
 				if (ast->_state == AST_STATE_DIALING) {
-					if (p->callprogress && CANPROGRESSDETECT(p) && p->dsp) {
+					if (p->callprogress && CANPROGRESSDETECT(p) && p->dsp && i->outgoing) {
 						ast_log(LOG_DEBUG, "Done dialing, but waiting for progress detection before doing more...\n");
 					} else if (p->confirmanswer || (!p->dialednone && ((p->sig == SIG_EM) || (p->sig == SIG_EMWINK) || (p->sig == SIG_FEATD) || (p->sig == SIG_FEATDMF) || (p->sig == SIG_FEATB) || (p->sig == SIG_SF) || (p->sig == SIG_SFWINK) || (p->sig == SIG_SF_FEATD) || (p->sig == SIG_SF_FEATDMF) || (p->sig == SIG_SF_FEATB)))) {
 						ast_setstate(ast, AST_STATE_RINGING);