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

simplify by using switch_caller_profile_clone. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5672 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-08-28 21:43:18 +00:00
parent c441fc5b09
commit f4140b22f0
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/switch_core_session.c
View File

@ -201,28 +201,14 @@ SWITCH_DECLARE(switch_call_cause_t) switch_core_session_outgoing_channel(switch_
ecaller_id_number = switch_channel_get_variable(channel, "effective_caller_id_number");
if (ecaller_id_name || ecaller_id_number) {
if (!ecaller_id_name) {
ecaller_id_name = caller_profile->caller_id_name;
}
if (!ecaller_id_number) {
ecaller_id_number = caller_profile->caller_id_number;
}
outgoing_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
caller_profile->username,
caller_profile->dialplan,
ecaller_id_name,
ecaller_id_number,
caller_profile->network_addr,
caller_profile->ani,
caller_profile->aniii,
caller_profile->rdnis,
caller_profile->source, caller_profile->context, caller_profile->destination_number);
outgoing_profile->flags = caller_profile->flags;
outgoing_profile->caller_ton = caller_profile->caller_ton;
outgoing_profile->caller_numplan = caller_profile->caller_numplan;
outgoing_profile->destination_number_ton = caller_profile->destination_number_ton;
outgoing_profile->destination_number_numplan = caller_profile->destination_number_numplan;
outgoing_profile = switch_caller_profile_clone(session, caller_profile);
if (ecaller_id_name) {
outgoing_profile->caller_id_name = ecaller_id_name;
}
if (ecaller_id_number) {
outgoing_profile->caller_id_number = ecaller_id_number;
}
}
}
if (!outgoing_profile) {