From: Moises Silva <moy@sangoma.com>
Date: Sun, 18 Dec 2011 00:36:47 +0000 (-0500)
Subject: freetdm: remove duplicated ss7 code for location number (previous git merge duplicate... 
X-Git-Tag: v1.2.3^2~71^2^2~217^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83b5929e482a30c7ff265904fe25270db9686148;p=thirdparty%2Ffreeswitch.git

freetdm: remove duplicated ss7 code for location number (previous git merge duplicated it)
---

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index b8154f96e8..6a061312a8 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -249,34 +249,6 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 				SS7_DEBUG_CHAN(ftdmchan, "No Location Number information in IAM%s\n", " ");
 			}
 
-			/* Retrieve the Location Number if present (see ITU Q.763, 3.30) */
-			if (siConEvnt->cgPtyNum1.eh.pres) {
-				if (siConEvnt->cgPtyNum1.addrSig.pres) {
-					/* fill in the ss7 location address number */
-					copy_tknStr_from_sngss7(siConEvnt->cgPtyNum1.addrSig, var, siConEvnt->cgPtyNum1.oddEven);
-					sngss7_add_var(sngss7_info, "ss7_loc_digits", var);
-				}
-
-				if (siConEvnt->cgPtyNum1.scrnInd.pres) {
-					/* fill in the screening indication value */
-					sprintf(var, "%d", siConEvnt->cgPtyNum1.scrnInd.val);
-					sngss7_add_var(sngss7_info, "ss7_loc_screen_ind", var);
-				}
-
-				if (siConEvnt->cgPtyNum1.presRest.pres) {
-					/* fill in the presentation value */
-					sprintf(var, "%d", siConEvnt->cgPtyNum1.presRest.val);
-					sngss7_add_var(sngss7_info, "ss7_loc_pres_ind", var);
-				}
-
-				if (siConEvnt->cgPtyNum1.natAddrInd.pres) {
-					sprintf(var, "%d", siConEvnt->cgPtyNum1.natAddrInd.val);
-					sngss7_add_var(sngss7_info, "ss7_loc_nadi", var);
-				}
-			} else {
-				SS7_DEBUG_CHAN(ftdmchan, "No Location Number information in IAM%s\n", " ");
-			}
-
 			sprintf(var, "%d", sngss7_info->circuit->cic);
 			sngss7_add_var(sngss7_info, "ss7_cic", var);