[Asterisk-cvs] libpri q931.c,1.81,1.82

[markster at lists.digium.com]

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

Modified Files:
	q931.c 
Log Message:
Never send channel identifier with SETUP when GR303 CPE


Index: q931.c
===================================================================
RCS file: /usr/cvsroot/libpri/q931.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- q931.c	27 Jun 2004 20:29:53 -0000	1.81
+++ q931.c	29 Jun 2004 04:28:34 -0000	1.82
@@ -2184,6 +2184,11 @@
 	c->userl1 = req->userl1;
 	c->ds1no = (req->channel & 0xff00) >> 8;
 	req->channel &= 0xff;
+	if ((pri->localtype == PRI_CPE) && pri->subchannel) {
+		req->channel = 0;
+		req->exclusive = 0;
+	}
+		
 	c->channelno = req->channel;		
 	c->slotmap = -1;
 	c->nonisdn = req->nonisdn;
@@ -2191,7 +2196,7 @@
 	c->complete = req->numcomplete; 
 	if (req->exclusive) 
 		c->chanflags = FLAG_EXCLUSIVE;
-	else
+	else if (c->channelno)
 		c->chanflags = FLAG_PREFERRED;
 	if (req->caller) {
 		strncpy(c->callernum, req->caller, sizeof(c->callernum) - 1);