[Asterisk-cvs] libpri pri_facility.c,1.22,1.23

[mattf]

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

Modified Files:
	pri_facility.c 
Log Message:
Fix so that APDUs are not added multiple times for a call (Bug #5361)


Index: pri_facility.c
===================================================================
RCS file: /usr/cvsroot/libpri/pri_facility.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- pri_facility.c	16 Sep 2005 17:15:57 -0000	1.22
+++ pri_facility.c	4 Oct 2005 17:35:48 -0000	1.23
@@ -1299,10 +1299,10 @@
 		return 0;
 
 	if (pri->switchtype == PRI_SWITCH_QSIG) { /* For Q.SIG it does network and cpe operations */
-		/* FIXME: Presumably, it should only send on a redirect */
-		if (call->redirectingnum) 
+		if (call->redirectingnum[0]) 
 			rose_diverting_leg_information2_encode(pri, call);
 		add_callername_facility_ies(pri, call, 1);
+		return 0;
 	}
 
 	if (pri->localtype == PRI_NETWORK) {
@@ -1313,6 +1313,7 @@
 			default:
 				break;
 		}
+		return 0;
 	} else if (pri->localtype == PRI_CPE) {
 		switch (pri->switchtype) {
 			case PRI_SWITCH_NI2:
@@ -1321,6 +1322,7 @@
 			default:
 				break;
 		}
+		return 0;
 	}
 
 	return 0;