From: James Zhang <jzhang@sangoma.com>
Date: Thu, 6 Oct 2011 23:16:03 +0000 (-0400)
Subject: freetdm: ss7 - fix cherry-pick conflict properly
X-Git-Tag: v1.2-rc1~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a44e4c1868435039a47c42e4cacaf77a4033960;p=thirdparty%2Ffreeswitch.git

freetdm: ss7 - fix cherry-pick conflict properly
---

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 5acc8d1214..dab2035450 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
@@ -223,28 +223,6 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 					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);
 
 				if (siConEvnt->cgPtyNum1.scrnInd.pres) {
 					/* fill in the screening indication value */