kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 08:49:01 +00:00
Code Issues Projects Releases Wiki Activity

freetdm: fixing format and loc_nadi value according to review board No. 98

Browse Source
This commit is contained in:
James Zhang 2012-02-24 16:32:44 -05:00
parent 713b55cd58
commit eeec65265a
2 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,21 +257,21 @@ ftdm_status_t copy_locPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCgPtyNum *loc
locPtyNum->natAddrInd.val = g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].loc_nadi; locPtyNum->natAddrInd.val = g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].loc_nadi;
locPtyNum->scrnInd.pres = pres_val; locPtyNum->scrnInd.pres = pres_val;
val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_loc_screen_ind"); val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_loc_screen_ind");
if (!ftdm_strlen_zero(val)) { if (!ftdm_strlen_zero(val)) {
locPtyNum->scrnInd.val = atoi(val); locPtyNum->scrnInd.val = atoi(val);
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Location Screening Ind %d\n", locPtyNum->scrnInd.val); ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Location Screening Ind %d\n", locPtyNum->scrnInd.val);
} else { } else {
locPtyNum->scrnInd.val = caller_data->screen; locPtyNum->scrnInd.val = caller_data->screen;
} }
locPtyNum->presRest.pres = pres_val; locPtyNum->presRest.pres = pres_val;
val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_loc_pres_ind"); val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_loc_pres_ind");
if (!ftdm_strlen_zero(val)) { if (!ftdm_strlen_zero(val)) {
locPtyNum->presRest.val = atoi(val); locPtyNum->presRest.val = atoi(val);
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Location Presentation Ind %d\n", locPtyNum->presRest.val); ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Location Presentation Ind %d\n", locPtyNum->presRest.val);
} else { } else {
locPtyNum->presRest.val = caller_data->pres; locPtyNum->presRest.val = caller_data->pres;
} }
locPtyNum->numPlan.pres = pres_val; locPtyNum->numPlan.pres = pres_val;
@ -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); ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Location Reference NADI value \"%s\"\n", loc_nadi);
locPtyNum->natAddrInd.val = atoi(loc_nadi); locPtyNum->natAddrInd.val = atoi(loc_nadi);
} else { } 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 = 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); return copy_tknStr_to_sngss7(caller_data->loc.digits, &locPtyNum->addrSig, &locPtyNum->oddEven);
} }
@ -640,7 +639,6 @@ ftdm_status_t copy_redirgInfo_to_sngss7(ftdm_channel_t *ftdmchan, SiRedirInfo *r
ftdm_status_t copy_ocn_from_sngss7(ftdm_channel_t *ftdmchan, SiOrigCdNum *origCdNum) ftdm_status_t copy_ocn_from_sngss7(ftdm_channel_t *ftdmchan, SiOrigCdNum *origCdNum)
{ {
char val[20]; char val[20];
sngss7_chan_data_t *sngss7_info = ftdmchan->call_data; sngss7_chan_data_t *sngss7_info = ftdmchan->call_data;
@ -649,28 +647,27 @@ ftdm_status_t copy_ocn_from_sngss7(ftdm_channel_t *ftdmchan, SiOrigCdNum *origCd
return FTDM_SUCCESS; return FTDM_SUCCESS;
} }
if (origCdNum->addrSig.pres == PRSNT_NODEF) { if (origCdNum->addrSig.pres == PRSNT_NODEF) {
copy_tknStr_from_sngss7(origCdNum->addrSig, val, origCdNum->oddEven); 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); sngss7_add_var(sngss7_info, "ss7_ocn", val);
} }
if (origCdNum->natAddr.pres == PRSNT_NODEF) { if (origCdNum->natAddr.pres == PRSNT_NODEF) {
snprintf(val, sizeof(val), "%d", origCdNum->natAddr.val); 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); sngss7_add_var(sngss7_info, "ss7_ocn_nadi", val);
} }
if (origCdNum->numPlan.pres == PRSNT_NODEF) { if (origCdNum->numPlan.pres == PRSNT_NODEF) {
snprintf(val, sizeof(val), "%d", origCdNum->numPlan.val); 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); sngss7_add_var(sngss7_info, "ss7_ocn_plan", val);
} }
if (origCdNum->presRest.pres == PRSNT_NODEF) { if (origCdNum->presRest.pres == PRSNT_NODEF) {
snprintf(val, sizeof(val), "%d", origCdNum->presRest.val); 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); sngss7_add_var(sngss7_info, "ss7_ocn_pres", val);
} }
@ -679,13 +676,12 @@ ftdm_status_t copy_ocn_from_sngss7(ftdm_channel_t *ftdmchan, SiOrigCdNum *origCd
ftdm_status_t copy_ocn_to_sngss7(ftdm_channel_t *ftdmchan, SiOrigCdNum *origCdNum) ftdm_status_t copy_ocn_to_sngss7(ftdm_channel_t *ftdmchan, SiOrigCdNum *origCdNum)
{ {
const char *val = NULL; const char *val = NULL;
int bProceed = 0; int bProceed = 0;
val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_ocn"); val = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_ocn");
if (!ftdm_strlen_zero(val)) { if (!ftdm_strlen_zero(val)) {
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Original Called Number \"%s\"\n", val); ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Original Called Number - Digits: %s\n", val);
if (copy_tknStr_to_sngss7((char*)val, &origCdNum->addrSig, &origCdNum->oddEven) != FTDM_SUCCESS) { if (copy_tknStr_to_sngss7((char*)val, &origCdNum->addrSig, &origCdNum->oddEven) != FTDM_SUCCESS) {
return FTDM_FAIL; return FTDM_FAIL;
} }
@ -698,7 +694,7 @@ ftdm_status_t copy_ocn_to_sngss7(ftdm_channel_t *ftdmchan, SiOrigCdNum *origCdNu
if (!ftdm_strlen_zero(val)) { if (!ftdm_strlen_zero(val)) {
origCdNum->natAddr.val = atoi(val); origCdNum->natAddr.val = atoi(val);
origCdNum->natAddr.pres = 1; origCdNum->natAddr.pres = 1;
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Original Called Number NADI value \"%s\"\n", val); ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Original Called Number - NADI: %s\n", val);
bProceed = 1; bProceed = 1;
} else { } else {
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Original Called Number NADI value\n"); ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Original Called Number NADI value\n");
@ -708,7 +704,7 @@ ftdm_status_t copy_ocn_to_sngss7(ftdm_channel_t *ftdmchan, SiOrigCdNum *origCdNu
if (!ftdm_strlen_zero(val)) { if (!ftdm_strlen_zero(val)) {
origCdNum->numPlan.val = atoi(val); origCdNum->numPlan.val = atoi(val);
origCdNum->numPlan.pres = 1; origCdNum->numPlan.pres = 1;
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Original Called Number Plan value \"%s\"\n", val); ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Original Called Number - Plan: %s\n", val);
bProceed = 1; bProceed = 1;
} else { } else {
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Original Called Number Plan value\n"); ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Original Called Number Plan value\n");
@ -718,7 +714,7 @@ ftdm_status_t copy_ocn_to_sngss7(ftdm_channel_t *ftdmchan, SiOrigCdNum *origCdNu
if (!ftdm_strlen_zero(val)) { if (!ftdm_strlen_zero(val)) {
origCdNum->presRest.val = atoi(val); origCdNum->presRest.val = atoi(val);
origCdNum->presRest.pres = 1; origCdNum->presRest.pres = 1;
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Original Called Number Presentation value \"%s\"\n", val); ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Found user supplied Original Called Number - Presentation: %s\n", val);
bProceed = 1; bProceed = 1;
} else { } else {
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Original Called Number Presentation value\n"); ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No user supplied Original Called Number Presentation value\n");
@ -730,7 +726,6 @@ ftdm_status_t copy_ocn_to_sngss7(ftdm_channel_t *ftdmchan, SiOrigCdNum *origCdNu
origCdNum->eh.pres = NOTPRSNT; origCdNum->eh.pres = NOTPRSNT;
} }
return FTDM_SUCCESS; return FTDM_SUCCESS;
} }

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

@ -1978,7 +1978,6 @@ static int ftmod_ss7_parse_cc_span(ftdm_conf_node_t *cc_span)
flag_loc_nadi = 1; flag_loc_nadi = 1;
sng_ccSpan.loc_nadi = atoi(parm->val); sng_ccSpan.loc_nadi = atoi(parm->val);
SS7_DEBUG("Found default LOC_NADI parm->value = %d\n", sng_ccSpan.loc_nadi); 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")) { } else if (!strcasecmp(parm->var, "lpa_on_cot")) {