[Asterisk-cvs] libpri q931.c,1.73,1.74

[markster at lists.digium.com]

Update of /usr/cvsroot/libpri
In directory mongoose.digium.com:/tmp/cvs-serv1905

Modified Files:
	q931.c 
Log Message:
Don't send proceeding when sending progress


Index: q931.c
===================================================================
RCS file: /usr/cvsroot/libpri/q931.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- q931.c	16 Jun 2004 17:16:37 -0000	1.73
+++ q931.c	16 Jun 2004 18:04:22 -0000	1.74
@@ -1811,8 +1811,11 @@
 
 int q931_call_progress(struct pri *pri, q931_call *c, int channel, int info)
 {
-	if (!c->proc) 
-		q931_call_proceeding(pri, c, channel, 0);
+	if (channel) { 
+		c->ds1no = (channel & 0xff00) >> 8;
+		channel &= 0xff;
+		c->channelno = channel;		
+	}
 	c->ourcallstate = Q931_CALL_STATE_INCOMING_CALL_PROCEEDING;
 	c->peercallstate = Q931_CALL_STATE_OUTGOING_CALL_PROCEEDING;
 	if (info) {
@@ -1821,7 +1824,6 @@
 		c->progress = Q931_PROG_INBAND_AVAILABLE;
 	} else
 		c->progress = -1;
-	c->proc = 1;
 	c->alive = 1;
 	return send_message(pri, c, Q931_PROGRESS, call_progress_ies);
 }