[Asterisk-cvs] libpri pri_facility.c,1.20,1.21 q931.c,1.137,1.138

[mattf]

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

Modified Files:
	pri_facility.c q931.c 
Log Message:
Don't specify DS1 on Q.SIG


Index: pri_facility.c
===================================================================
RCS file: /usr/cvsroot/libpri/pri_facility.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- pri_facility.c	13 Jul 2005 14:09:16 -0000	1.20
+++ pri_facility.c	16 Sep 2005 17:02:44 -0000	1.21
@@ -1300,7 +1300,8 @@
 
 	if (pri->switchtype == PRI_SWITCH_QSIG) { /* For Q.SIG it does network and cpe operations */
 		/* FIXME: Presumably, it should only send on a redirect */
-		rose_diverting_leg_information2_encode(pri, call);
+		if (call->redirecting) 
+			rose_diverting_leg_information2_encode(pri, call);
 		add_callername_facility_ies(pri, call, 1);
 	}
 

Index: q931.c
===================================================================
RCS file: /usr/cvsroot/libpri/q931.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- q931.c	15 Sep 2005 15:46:09 -0000	1.137
+++ q931.c	16 Sep 2005 17:02:44 -0000	1.138
@@ -361,7 +361,7 @@
 		return 0;
 	}
 
-	if ((call->ds1no > 0) || call->ds1explicit) {
+	if ((pri->switchtype != PRI_SWITCH_QSIG) && (call->ds1no > 0) || call->ds1explicit) {
 		/* Note that we are specifying the identifier */
 		ie->data[pos++] |= 0x40;
 		/* We need to use the Channel Identifier Present thingy.  Just specify it and we're done */