[Asterisk-cvs] libpri q931.c,1.44,1.45

[markster at lists.digium.com]

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

Modified Files:
	q931.c 
Log Message:
If userl1 is -1, don't include it


Index: q931.c
===================================================================
RCS file: /usr/cvsroot/libpri/q931.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- q931.c	28 Jan 2004 21:02:23 -0000	1.44
+++ q931.c	8 Feb 2004 00:20:18 -0000	1.45
@@ -641,14 +641,15 @@
 	ie->data[1] = call->transmoderate | 0x80;
 	if (call->transmoderate != TRANS_MODE_PACKET) {
 		/* If you have an AT&T 4ESS, you don't send any more info */
-		if (pri->switchtype == PRI_SWITCH_ATT4ESS)
+		if ((pri->switchtype != PRI_SWITCH_ATT4ESS) && (call->userl1 > -1)) {
+			ie->data[2] = call->userl1 | 0x80; /* XXX Ext bit? XXX */
+			if (call->userl1 == PRI_LAYER_1_ITU_RATE_ADAPT) {
+				ie->data[3] = call->rateadaption | 0x80;
+				return 6;
+			}
+			return 5;
+		} else
 			return 4;
-		ie->data[2] = call->userl1 | 0x80; /* XXX Ext bit? XXX */
-		if (call->userl1 == PRI_LAYER_1_ITU_RATE_ADAPT) {
-			ie->data[3] = call->rateadaption | 0x80;
-			return 6;
-		}
-		return 5;
 	} else {
 		ie->data[2] = 0x80 | call->userl2;
 		ie->data[3] = 0x80 | call->userl3;