[Asterisk-cvs] asterisk/channels chan_zap.c,1.234,1.235

[markster at lists.digium.com]

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

Modified Files:
	chan_zap.c 
Log Message:
Obviously don't send alerting, progress, or proceeding on outbound calls (bug #1700)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- chan_zap.c	22 May 2004 15:36:59 -0000	1.234
+++ chan_zap.c	22 May 2004 19:05:53 -0000	1.235
@@ -1665,7 +1665,6 @@
 			ast_mutex_unlock(&p->lock);
 			return -1;
 		}
-		p->proceeding = 1;
 		ast_setstate(ast, AST_STATE_DIALING);
 		pri_rel(p->pri);
 		break;
@@ -3853,7 +3852,7 @@
 	}
 	
 #ifdef PRI_EVENT_PROCEEDING
-	if (!p->proceeding && p->sig==SIG_PRI && p->pri) {
+	if (!p->proceeding && p->sig==SIG_PRI && p->pri && !p->outgoing) {
 		if (p->pri->pri) {		
 			if (!pri_grab(p, p->pri)) {
 #ifdef PRI_PROGRESS
@@ -3941,7 +3940,7 @@
 			break;
 		case AST_CONTROL_RINGING:
 #ifdef ZAPATA_PRI
-			if (!p->proceeding && p->sig==SIG_PRI && p->pri) {
+			if (!p->proceeding && p->sig==SIG_PRI && p->pri && !p->outgoing) {
 				if (p->pri->pri) {		
 					if (!pri_grab(p, p->pri)) {
 						pri_acknowledge(p->pri->pri,p->call, p->prioffset, 1);
@@ -3969,7 +3968,7 @@
 			ast_log(LOG_DEBUG,"Received AST_CONTROL_PROGRESS on %s\n",chan->name);
 #ifdef ZAPATA_PRI
 #ifdef PRI_EVENT_PROCEEDING
-			if (!p->proceeding && p->sig==SIG_PRI && p->pri) {
+			if (!p->proceeding && p->sig==SIG_PRI && p->pri && !p->outgoing) {
 				if (p->pri->pri) {		
 					if (!pri_grab(p, p->pri)) {
 #ifdef PRI_PROGRESS