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

Merge pull request #1135 in FS/freeswitch from ~TCULJAGA/freeswitch_tc:feature/FS-9874-pass-a-translate-profile-for-mod_translate to master 

* commit '4f3a5ebe07f1d09cacd5429ab30ccb0670e7ef91':
  FS-9874 - implement use of translate:<profile> - squashed
This commit is contained in:
Mike Jerris 2017-02-02 16:02:24 -06:00
parent 8192e9cb04 4f3a5ebe07
commit 9858ad7208
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mod/applications/mod_translate/mod_translate.c
View File

@ -258,9 +258,11 @@ SWITCH_STANDARD_DIALPLAN(translate_dialplan_hunt)
switch_channel_t *channel = switch_core_session_get_channel(session);
char *translated_dest = NULL;
char *translated_cid_num = NULL;
char *translated_ani = NULL;
char *translate_profile = NULL;
char *areacode = NULL;
if (!caller_profile) {
if (!(caller_profile = switch_channel_get_caller_profile(channel))) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error Obtaining Profile!\n");
@ -271,7 +273,12 @@ SWITCH_STANDARD_DIALPLAN(translate_dialplan_hunt)
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Processing %s <%s>->%s in translate\n",
caller_profile->caller_id_name, caller_profile->caller_id_number, caller_profile->destination_number);
if ((translate_profile = (char *) switch_channel_get_variable(channel, "translate_profile"))) {
if ((translate_profile = (char *) arg)) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
"using translate:<profile> [%s] for translate profile\n",translate_profile);
} else if ((translate_profile = (char *) switch_channel_get_variable(channel, "translate_profile"))) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
"using translate_profile variable [%s] for translate profile\n", translate_profile);
} else if ((translate_profile = (char *) switch_channel_get_variable(channel, "country"))) {
@ -295,14 +302,21 @@ SWITCH_STANDARD_DIALPLAN(translate_dialplan_hunt)
translate_number((char *) caller_profile->destination_number, translate_profile, &translated_dest, session, NULL, NULL);
translate_number((char *) caller_profile->caller_id_number, translate_profile, &translated_cid_num, session, NULL, NULL);
/* maybe we should translate ani/aniii here too? */
translate_number((char *) caller_profile->ani, translate_profile, &translated_ani, session, NULL, NULL);
/* maybe we should translate aniii here too? */
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO,
"Profile: [%s] Translated Destination: [%s] Translated CID: [%s]\n", translate_profile, translated_dest, translated_cid_num);
"Profile: [%s], Translated Destination: [%s], Translated CID: [%s], Translated ANI: [%s]\n", translate_profile, translated_dest, translated_cid_num, translated_ani);
if (!zstr(translated_cid_num)) {
caller_profile->caller_id_number = translated_cid_num;
}
if (!zstr(translated_ani)) {
caller_profile->ani = translated_ani;
}
if (!zstr(translated_dest)) {
caller_profile->destination_number = translated_dest;
}