FSCORE-471 and any other update related bugs

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15186 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale committed 2009-10-21 18:48:28 +00:00
1 parent 6b0f923f49
commit 4d9f7de25b
11 files changed
+126 -53

No files matched your search

+5 -1
View File
@@ -385,6 +385,9 @@ static uint8_t check_channel_status(originate_global_t *oglobals, originate_stat
if (!oglobals->ring_ready) {
oglobals->ring_ready = 1;
if (caller_channel && !oglobals->ignore_ring_ready) {
if (len == 1) {
switch_channel_pass_callee_id(originate_status[0].peer_channel, caller_channel);
}
switch_channel_ring_ready(caller_channel);
oglobals->sent_ring = 1;
}
@@ -2321,6 +2324,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
if (caller_channel) {
if (switch_channel_test_flag(peer_channel, CF_ANSWERED)) {
switch_channel_pass_callee_id(peer_channel, caller_channel);
status = switch_channel_answer(caller_channel);
} else if (switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) {
status = switch_channel_pre_answer(caller_channel);
@@ -2561,7 +2565,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
switch_safe_free(write_frame.data);
switch_safe_free(fail_on_single_reject_var);
if (caller_channel) {
switch_channel_clear_flag(caller_channel, CF_ORIGINATOR);
switch_channel_clear_flag(caller_channel, CF_XFER_ZOMBIE);