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

FS-3097 regression from 4f93ea25ec

This commit is contained in:
Anthony Minessale 2011-02-24 10:17:33 -06:00
parent cb6f1ed61d
commit 155aafd3f4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/switch_channel.h
View File

@ -79,6 +79,7 @@ SWITCH_DECLARE(int) switch_channel_test_ready(switch_channel_t *channel, switch_
#define switch_channel_ready(_channel) switch_channel_test_ready(_channel, SWITCH_TRUE, SWITCH_FALSE)
#define switch_channel_media_ready(_channel) switch_channel_test_ready(_channel, SWITCH_TRUE, SWITCH_TRUE)
#define switch_channel_media_up(_channel) (switch_channel_test_flag(_channel, CF_ANSWERED) || switch_channel_test_flag(_channel, CF_EARLY_MEDIA))
#define switch_channel_up(_channel) (switch_channel_get_state(_channel) < CS_HANGUP)
#define switch_channel_down(_channel) (switch_channel_get_state(_channel) >= CS_HANGUP)

6
src/switch_ivr_bridge.c
View File

@ -1398,10 +1398,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(const char *originator_uu
return SWITCH_STATUS_FALSE;
}
//if (!switch_channel_test_flag(originator_channel, CF_ANSWERED)) {
if (!switch_channel_media_ready(originator_channel)) {
if (switch_channel_media_ready(originatee_channel)) {
//if (switch_channel_test_flag(originatee_channel, CF_ANSWERED)) {
if (!switch_channel_media_up(originator_channel)) {
if (switch_channel_media_up(originatee_channel)) {
swap_session = originator_session;
originator_session = originatee_session;
originatee_session = swap_session;