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

FS-5757

This commit is contained in:
Anthony Minessale 2013-09-06 04:49:07 +05:00
parent a5e28f93c6
commit e6e4c62913
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -8699,19 +8699,28 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
tech_pvt->caller_profile->destination_number = switch_core_sprintf(tech_pvt->caller_profile->pool, tech_pvt->caller_profile->destination_number = switch_core_sprintf(tech_pvt->caller_profile->pool,
"%sanswer,intercept:%s", codec_str, bridge_uuid); "%sanswer,intercept:%s", codec_str, bridge_uuid);
} else { } else {
const char *name = NULL, *num = NULL;
switch_caller_profile_t *bcp = switch_channel_get_caller_profile(b_channel); switch_caller_profile_t *bcp = switch_channel_get_caller_profile(b_channel);
if (switch_channel_test_flag(b_channel, CF_BRIDGE_ORIGINATOR) || !switch_channel_test_flag(b_channel, CF_BRIDGED)) { if (switch_channel_test_flag(b_channel, CF_BRIDGE_ORIGINATOR)) {
name = bcp->callee_id_name; switch_channel_set_flag(tech_pvt->channel, CF_BRIDGE_ORIGINATOR);
num = bcp->callee_id_number;
} else {
name = bcp->caller_id_name;
num = bcp->caller_id_number;
} }
tech_pvt->caller_profile->callee_id_name = switch_core_strdup(tech_pvt->caller_profile->pool, name); if (!zstr(bcp->callee_id_name)) {
tech_pvt->caller_profile->callee_id_number = switch_core_strdup(tech_pvt->caller_profile->pool, num); tech_pvt->caller_profile->callee_id_name = switch_core_strdup(tech_pvt->caller_profile->pool, bcp->callee_id_name);
}
if (!zstr(bcp->callee_id_number)) {
tech_pvt->caller_profile->callee_id_number = switch_core_strdup(tech_pvt->caller_profile->pool, bcp->callee_id_number);
}
if (!zstr(bcp->caller_id_name)) {
tech_pvt->caller_profile->caller_id_name = switch_core_strdup(tech_pvt->caller_profile->pool, bcp->caller_id_name);
}
if (!zstr(bcp->caller_id_number)) {
tech_pvt->caller_profile->caller_id_number = switch_core_strdup(tech_pvt->caller_profile->pool, bcp->caller_id_number);
}
if (bcp->originatee_caller_profile) { if (bcp->originatee_caller_profile) {
switch_caller_profile_t *cp; switch_caller_profile_t *cp;

3
src/switch_ivr_async.c
View File

@ -1775,9 +1775,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session
name = cp->caller_id_name; name = cp->caller_id_name;
num = cp->caller_id_number; num = cp->caller_id_number;
} }
my_cp->callee_id_name = switch_core_strdup(my_cp->pool, name);
my_cp->callee_id_number = switch_core_strdup(my_cp->pool, num);
} }
sanity = 300; sanity = 300;