Revision

16477

Author

anthm

Date

2010-01-23 00:53:30 -0600 (Sat, 23 Jan 2010)

Log Message

omfg

Modified Paths

• freeswitch/trunk/src/switch_core_session.c
• freeswitch/trunk/src/switch_ivr.c
• freeswitch/trunk/src/switch_ivr_bridge.c

Diff

--- freeswitch/trunk/src/switch_core_session.c	2010-01-23 06:50:13 UTC (rev 16476)
+++ freeswitch/trunk/src/switch_core_session.c	2010-01-23 06:53:30 UTC (rev 16477)
@@ -985,10 +985,16 @@
 
 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 (switch_mutex_trylock(session->mutex) == SWITCH_STATUS_SUCCESS) {
-		switch_thread_cond_signal(session->cond);
-		switch_mutex_unlock(session->mutex);
+	for(;;) {
+		if (switch_mutex_trylock(session->mutex) == SWITCH_STATUS_SUCCESS) {
+			switch_thread_cond_signal(session->cond);
+			switch_mutex_unlock(session->mutex);
+			return;
+		}
+		if (!--x) return;
+		switch_yield(1000);
 	}
 }
 

--- freeswitch/trunk/src/switch_ivr.c	2010-01-23 06:50:13 UTC (rev 16476)
+++ freeswitch/trunk/src/switch_ivr.c	2010-01-23 06:53:30 UTC (rev 16477)
@@ -1216,6 +1216,8 @@
 				switch_assert(other_channel != NULL);
 				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_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_channel_clear_state_handler(other_channel, NULL);
 				switch_core_session_rwunlock(other_session);
@@ -1262,25 +1264,43 @@
 		}
 
 		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);
 
 			if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) &&
 				(other_session = switch_core_session_locate(other_uuid))) {
 				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_channel_clear_state_handler(other_channel, NULL);
 			}
 
 			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);
 				if (swap) {
 					switch_ivr_signal_bridge(other_session, session);
 				} else {
 					switch_ivr_signal_bridge(session, other_session);
 				}
-				switch_channel_wait_for_flag(channel, CF_BRIDGED, SWITCH_TRUE, 1000, NULL);
-				switch_channel_wait_for_flag(other_channel, CF_BRIDGED, SWITCH_TRUE, 1000, NULL);
+				switch_channel_wait_for_state(other_channel, channel, CS_HIBERNATE);
+				switch_channel_wait_for_state(channel, other_channel, CS_HIBERNATE);
 				switch_core_session_rwunlock(other_session);
 			}
 		}

--- freeswitch/trunk/src/switch_ivr_bridge.c	2010-01-23 06:50:13 UTC (rev 16476)
+++ freeswitch/trunk/src/switch_ivr_bridge.c	2010-01-23 06:53:30 UTC (rev 16477)
@@ -891,7 +891,7 @@
 		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);
 		return SWITCH_STATUS_FALSE;
 	}
@@ -1192,9 +1192,13 @@
     }
 
 	if (switch_channel_test_flag(caller_channel, CF_REDIRECT)) {
-		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);
+		if (switch_channel_test_flag(caller_channel, CF_RESET)) {
+			switch_channel_clear_flag(caller_channel, CF_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);
+			}
 		}
 	}