kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-02 11:19:28 +00:00
Code Issues Projects Releases Wiki Activity

freetdm: fixing problem during review - review board number 98

Browse Source
This commit is contained in:
James Zhang 2012-02-24 16:09:58 -05:00
parent 6ed6fd2c1a
commit 938fafb09e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
View File

@ -286,10 +286,9 @@ ftdm_status_t copy_locPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyNum *loc
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Location Reference NADI value \"%s\"\n", loc_nadi);
locPtyNum->natAddrInd.val = atoi(loc_nadi);
} else {
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "No user supplied NADI value found for LOC, using \"%d\"\n", locPtyNum->natAddrInd.val);
locPtyNum->natAddrInd.val = g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].loc_nadi;
locPtyNum->natAddrInd.val = 0x03;
}
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "No user supplied NADI value found for LOC, using \"%d\"\n", locPtyNum->natAddrInd.val);
}
return copy_tknStr_to_sngss7(caller_data->loc.digits, &locPtyNum->addrSig, &locPtyNum->oddEven);
}
@ -650,25 +649,25 @@ ftdm_status_t copy_ocn_from_sngss7(ftdm_channel_t *ftdmchan, SiOrigCdNum *origCd
if (origCdNum->addrSig.pres == PRSNT_NODEF) {
copy_tknStr_from_sngss7(origCdNum->addrSig, val, origCdNum->oddEven);
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Original Called Number digits:%s\n", val);
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Original Called Number - Digits: %s\n", val);
sngss7_add_var(sngss7_info, "ss7_ocn", val);
}
if (origCdNum->natAddr.pres == PRSNT_NODEF) {
snprintf(val, sizeof(val), "%d", origCdNum->natAddr.val);
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Original Called Number - NADI:%s\n", val);
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Original Called Number - NADI: %s\n", val);
sngss7_add_var(sngss7_info, "ss7_ocn_nadi", val);
}
if (origCdNum->numPlan.pres == PRSNT_NODEF) {
snprintf(val, sizeof(val), "%d", origCdNum->numPlan.val);
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Original Called Number -plan:%s\n", val);
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Original Called Number -Plan: %s\n", val);
sngss7_add_var(sngss7_info, "ss7_ocn_plan", val);
}
if (origCdNum->presRest.pres == PRSNT_NODEF) {
snprintf(val, sizeof(val), "%d", origCdNum->presRest.val);
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Original Called Number - presentation:%s\n", val);
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Original Called Number - Presentation: %s\n", val);
sngss7_add_var(sngss7_info, "ss7_ocn_pres", val);
}

3
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
View File

@ -2004,8 +2004,7 @@ static int ftmod_ss7_parse_cc_span(ftdm_conf_node_t *cc_span)
flag_loc_nadi = 1;
sng_ccSpan.loc_nadi = atoi(parm->val);
SS7_DEBUG("Found default LOC_NADI parm->value = %d\n", sng_ccSpan.loc_nadi);
printf( " --- jz: we got loc nadi from XML, val = %d \n" , sng_ccSpan.loc_nadi);
/**********************************************************************/
} else if (!strcasecmp(parm->var, "lpa_on_cot")) {
/**********************************************************************/