kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

freetdm: changing call reference to generic header; removing location area code

This commit is contained in:
root 2011-09-30 13:09:13 -04:00
parent dbd6bb9a83
commit 595454126b
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/freetdm/mod_freetdm/mod_freetdm.c
View File

@ -1760,21 +1760,12 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-Screen", "%d", channel_caller_data->screen); switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-Screen", "%d", channel_caller_data->screen);
switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-Presentation", "%d", channel_caller_data->pres); switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-Presentation", "%d", channel_caller_data->pres);
switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-CallReference", "%d", channel_caller_data->call_reference);
var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_opc"); var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_opc");
if (!ftdm_strlen_zero(var_value)) { if (!ftdm_strlen_zero(var_value)) {
switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-OPC", "%s", var_value); switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-OPC", "%s", var_value);
} }
var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_lac");
if (!ftdm_strlen_zero(var_value)) {
switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-LAC", "%s", var_value);
}
var_value = ftdm_sigmsg_get_var(sigmsg, "ss7_crn");
if (!ftdm_strlen_zero(var_value)) {
switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-CRN", "%s", var_value);
}
} }
/* Add any call variable to the dial plan */ /* Add any call variable to the dial plan */

5
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
View File

@ -223,8 +223,9 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
sngss7_add_var(sngss7_info, "ss7_opc", var); sngss7_add_var(sngss7_info, "ss7_opc", var);
if (siConEvnt->callRef.callId.pres) { if (siConEvnt->callRef.callId.pres) {
sprintf(var, "%u", (unsigned int)siConEvnt->callRef.callId.val); ftdmchan->caller_data.call_reference = (unsigned int)siConEvnt->callRef.callId.val;
sngss7_add_var(sngss7_info, "ss7_crn", var); } else {
ftdmchan->caller_data.call_reference = 0;
} }
if (sngss7_info->circuit->transparent_iam) { if (sngss7_info->circuit->transparent_iam) {

1
libs/freetdm/src/include/freetdm.h
View File

@ -362,6 +362,7 @@ typedef struct ftdm_caller_data {
/* user information layer 1 protocol */ /* user information layer 1 protocol */
ftdm_user_layer1_prot_t bearer_layer1; ftdm_user_layer1_prot_t bearer_layer1;
ftdm_calling_party_category_t cpc; /*!< Calling party category */ ftdm_calling_party_category_t cpc; /*!< Calling party category */
uint32_t call_reference;
ftdm_channel_t *fchan; /*!< FreeTDM channel associated (can be NULL) */ ftdm_channel_t *fchan; /*!< FreeTDM channel associated (can be NULL) */