[Asterisk-cvs] libpri q931.c,1.57,1.58

[markster at lists.digium.com]

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

Modified Files:
	q931.c 
Log Message:
Properly handle non-transmission of channel identifier


Index: q931.c
===================================================================
RCS file: /usr/cvsroot/libpri/q931.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- q931.c	19 May 2004 22:02:40 -0000	1.57
+++ q931.c	20 May 2004 00:21:16 -0000	1.58
@@ -360,8 +360,6 @@
 static int transmit_channel_id(struct pri *pri, q931_call *call, int msgtype, q931_ie *ie, int len)
 {
 	int pos=0;
-	if (!call->channelno)
-		return 0;
 	/* Start with standard stuff */
 	ie->data[pos] = 0xa1;
 	/* Add exclusive flag if necessary */
@@ -1569,16 +1567,15 @@
 }
 
 #ifdef ALERTING_NO_PROGRESS
-static int call_progress_ies[] = { Q931_CHANNEL_IDENT, -1 };
+static int call_progress_ies[] = { -1 };
 #else
-static int call_progress_ies[] = { Q931_CHANNEL_IDENT, Q931_PROGRESS_INDICATOR, -1 };
+static int call_progress_ies[] = { Q931_PROGRESS_INDICATOR, -1 };
 #endif
 
 int q931_call_progress(struct pri *pri, q931_call *c, int channel, int info)
 {
 	if (!c->proc) 
 		q931_call_proceeding(pri, c, channel, 0);
-	c->channelno = 0;		
 	c->ourcallstate = Q931_CALL_STATE_INCOMING_CALL_PROCEEDING;
 	c->peercallstate = Q931_CALL_STATE_OUTGOING_CALL_PROCEEDING;
 	if (info) {
@@ -1617,9 +1614,9 @@
 	return send_message(pri, c, Q931_CALL_PROCEEDING, call_proceeding_ies);
 }
 #ifndef ALERTING_NO_PROGRESS
-static int alerting_ies[] = { Q931_CHANNEL_IDENT, Q931_PROGRESS_INDICATOR, -1 };
+static int alerting_ies[] = { Q931_PROGRESS_INDICATOR, -1 };
 #else
-static int alerting_ies[] = { Q931_CHANNEL_IDENT, -1 };
+static int alerting_ies[] = { -1 };
 #endif
 
 int q931_alerting(struct pri *pri, q931_call *c, int channel, int info)