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

fix att_xfer issue MAILING_LIST-00 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14438 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-07-31 19:09:50 +00:00
parent fe1cdabb0b
commit 92d620fc48
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mod/applications/mod_dptools/mod_dptools.c
View File

@ -1511,6 +1511,7 @@ static switch_status_t xfer_on_dtmf(switch_core_session_t *session, void *input,
switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session); switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session);
if (dtmf->digit == '#') { if (dtmf->digit == '#') {
switch_channel_hangup(peer_channel, SWITCH_CAUSE_NORMAL_CLEARING);
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }

12
src/switch_ivr_bridge.c
View File

@ -450,9 +450,7 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
switch_core_session_reset(session_a, SWITCH_TRUE, SWITCH_TRUE); switch_core_session_reset(session_a, SWITCH_TRUE, SWITCH_TRUE);
switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a));
if (!inner_bridge) {
switch_channel_clear_flag(chan_a, CF_BRIDGED); switch_channel_clear_flag(chan_a, CF_BRIDGED);
}
switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK);
switch_core_session_rwunlock(session_b); switch_core_session_rwunlock(session_b);
return NULL; return NULL;
@ -948,6 +946,16 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
switch_cond_next(); switch_cond_next();
} }
if (inner_bridge) {
if (switch_channel_ready(caller_channel)) {
switch_channel_set_flag(caller_channel, CF_BRIDGED);
}
if (switch_channel_ready(peer_channel)) {
switch_channel_set_flag(peer_channel, CF_BRIDGED);
}
}
if ((cause = switch_channel_get_cause(caller_channel))) { if ((cause = switch_channel_get_cause(caller_channel))) {
switch_channel_set_variable(peer_channel, SWITCH_BRIDGE_HANGUP_CAUSE_VARIABLE, switch_channel_cause2str(cause)); switch_channel_set_variable(peer_channel, SWITCH_BRIDGE_HANGUP_CAUSE_VARIABLE, switch_channel_cause2str(cause));
} }