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

omfg 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16477 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2010-01-23 06:53:30 +00:00
parent a9f33bc1a6
commit 25a4270e3d
3 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/switch_core_session.c
View File

@ -985,10 +985,16 @@ SWITCH_DECLARE(switch_channel_t *) switch_core_session_get_channel(switch_core_s
SWITCH_DECLARE(void) switch_core_session_wake_session_thread(switch_core_session_t *session) SWITCH_DECLARE(void) switch_core_session_wake_session_thread(switch_core_session_t *session)
{ {
int x = 5;
/* If trylock fails the signal is already awake so we needn't bother */ /* If trylock fails the signal is already awake so we needn't bother */
if (switch_mutex_trylock(session->mutex) == SWITCH_STATUS_SUCCESS) { for(;;) {
switch_thread_cond_signal(session->cond); if (switch_mutex_trylock(session->mutex) == SWITCH_STATUS_SUCCESS) {
switch_mutex_unlock(session->mutex); switch_thread_cond_signal(session->cond);
switch_mutex_unlock(session->mutex);
return;
}
if (!--x) return;
switch_yield(1000);
} }
} }

24
src/switch_ivr.c
View File

@ -1216,6 +1216,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_media(const char *uuid, switch_media_
switch_assert(other_channel != NULL); switch_assert(other_channel != NULL);
switch_core_session_receive_message(other_session, &msg); switch_core_session_receive_message(other_session, &msg);
switch_channel_wait_for_flag(other_channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000, NULL); switch_channel_wait_for_flag(other_channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000, NULL);
switch_channel_wait_for_flag(other_channel, CF_MEDIA_ACK, SWITCH_TRUE, 10000, NULL);
switch_channel_wait_for_flag(other_channel, CF_MEDIA_SET, SWITCH_TRUE, 10000, NULL);
switch_core_session_read_frame(other_session, &read_frame, SWITCH_IO_FLAG_NONE, 0); switch_core_session_read_frame(other_session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
switch_channel_clear_state_handler(other_channel, NULL); switch_channel_clear_state_handler(other_channel, NULL);
switch_core_session_rwunlock(other_session); switch_core_session_rwunlock(other_session);
@ -1262,25 +1264,43 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_nomedia(const char *uuid, switch_medi
} }
if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_PROXY_MODE)) { if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_PROXY_MODE)) {
switch_channel_set_flag(channel, CF_REDIRECT);
switch_channel_set_state(channel, CS_PARK);
switch_channel_set_flag(channel, CF_TRANSFER);
switch_core_session_receive_message(session, &msg); switch_core_session_receive_message(session, &msg);
if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) &&
(other_session = switch_core_session_locate(other_uuid))) { (other_session = switch_core_session_locate(other_uuid))) {
other_channel = switch_core_session_get_channel(other_session); other_channel = switch_core_session_get_channel(other_session);
switch_channel_set_flag(other_channel, CF_REDIRECT);
switch_channel_set_state(other_channel, CS_PARK);
switch_channel_set_flag(other_channel, CF_TRANSFER);
switch_core_session_receive_message(other_session, &msg); switch_core_session_receive_message(other_session, &msg);
switch_channel_clear_state_handler(other_channel, NULL); switch_channel_clear_state_handler(other_channel, NULL);
} }
if (other_channel) { if (other_channel) {
switch_channel_wait_for_state(other_channel, channel, CS_PARK);
}
switch_channel_wait_for_state_timeout(channel, CS_PARK, 5000000);
switch_channel_clear_flag(channel, CF_NOT_READY);
if (other_channel) {
switch_channel_clear_flag(other_channel, CF_NOT_READY);
switch_channel_clear_state_handler(channel, NULL); switch_channel_clear_state_handler(channel, NULL);
if (swap) { if (swap) {
switch_ivr_signal_bridge(other_session, session); switch_ivr_signal_bridge(other_session, session);
} else { } else {
switch_ivr_signal_bridge(session, other_session); switch_ivr_signal_bridge(session, other_session);
} }
switch_channel_wait_for_flag(channel, CF_BRIDGED, SWITCH_TRUE, 1000, NULL); switch_channel_wait_for_state(other_channel, channel, CS_HIBERNATE);
switch_channel_wait_for_flag(other_channel, CF_BRIDGED, SWITCH_TRUE, 1000, NULL); switch_channel_wait_for_state(channel, other_channel, CS_HIBERNATE);
switch_core_session_rwunlock(other_session); switch_core_session_rwunlock(other_session);
} }
} }

12
src/switch_ivr_bridge.c
View File

@ -891,7 +891,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_signal_bridge(switch_core_session_t *
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
if (!switch_channel_ready(caller_channel)) { if (!switch_channel_up(caller_channel)) {
switch_channel_hangup(peer_channel, SWITCH_CAUSE_ORIGINATOR_CANCEL); switch_channel_hangup(peer_channel, SWITCH_CAUSE_ORIGINATOR_CANCEL);
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
@ -1192,9 +1192,13 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
} }
if (switch_channel_test_flag(caller_channel, CF_REDIRECT)) { if (switch_channel_test_flag(caller_channel, CF_REDIRECT)) {
state = switch_channel_get_state(caller_channel); if (switch_channel_test_flag(caller_channel, CF_RESET)) {
if (!(state == CS_RESET || state == CS_PARK || state == CS_ROUTING)) { switch_channel_clear_flag(caller_channel, CF_RESET);
switch_channel_set_state(caller_channel, CS_RESET); } else {
state = switch_channel_get_state(caller_channel);
if (!(state == CS_RESET || state == CS_PARK || state == CS_ROUTING)) {
switch_channel_set_state(caller_channel, CS_RESET);
}
} }
} }