Author: knhor Date: Sun Dec 17 17:50:12 2006 New Revision: 3689 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: use the conference caller id name and number for outbound calls if not specified Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Sun Dec 17 17:50:12 2006 @@ -3093,9 +3093,17 @@ return SWITCH_STATUS_FALSE; } - if (session) { + if (session != NULL) { caller_channel = switch_core_session_get_channel(session); + } + + if (switch_strlen_zero(cid_name)) { + cid_name = conference->caller_id_name; + } + + if (switch_strlen_zero(cid_num)) { + cid_num = conference->caller_id_number; } /* establish an outbound call leg */