Revision

15329

Author

anthm

Date

2009-11-03 10:50:16 -0600 (Tue, 03 Nov 2009)

Log Message

FSCORE-479

Modified Paths

• freeswitch/trunk/src/include/switch_types.h
• freeswitch/trunk/src/switch_channel.c
• freeswitch/trunk/src/switch_core_state_machine.c
• freeswitch/trunk/src/switch_ivr_bridge.c

Diff

--- freeswitch/trunk/src/include/switch_types.h	2009-11-03 10:48:23 UTC (rev 15328)
+++ freeswitch/trunk/src/include/switch_types.h	2009-11-03 16:50:16 UTC (rev 15329)
@@ -927,6 +927,8 @@
 	CF_THREAD_SLEEPING,
 	CF_DISABLE_RINGBACK,
 	CF_NOT_READY,
+	CF_SIGNAL_BRIDGE_TTL,
+	CF_MEDIA_BRIDGE_TTL,
 	/* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */
 	CF_FLAG_MAX
 } switch_channel_flag_t;

--- freeswitch/trunk/src/switch_channel.c	2009-11-03 10:48:23 UTC (rev 15328)
+++ freeswitch/trunk/src/switch_channel.c	2009-11-03 16:50:16 UTC (rev 15329)
@@ -768,7 +768,7 @@
 SWITCH_DECLARE(uint32_t) switch_channel_test_flag(switch_channel_t *channel, switch_channel_flag_t flag)
 {
 	switch_assert(channel != NULL);
-	return channel->flags[flag] ? 1 : 0;
+	return channel->flags[flag];
 }
 
 SWITCH_DECLARE(switch_bool_t) switch_channel_set_flag_partner(switch_channel_t *channel, switch_channel_flag_t flag)

--- freeswitch/trunk/src/switch_core_state_machine.c	2009-11-03 10:48:23 UTC (rev 15328)
+++ freeswitch/trunk/src/switch_core_state_machine.c	2009-11-03 16:50:16 UTC (rev 15329)
@@ -77,7 +77,11 @@
 
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard ROUTING\n", switch_channel_get_name(session->channel));
 
-	if (switch_channel_test_flag(session->channel, CF_PROXY_MODE)) {
+	if (
+		(switch_channel_test_flag(session->channel, CF_ANSWERED) || 
+		 switch_channel_test_flag(session->channel, CF_EARLY_MEDIA) ||
+		 switch_channel_test_flag(session->channel, CF_SIGNAL_BRIDGE_TTL)) && 
+		switch_channel_test_flag(session->channel, CF_PROXY_MODE)) {
 		switch_ivr_media(session->uuid_str, SMF_NONE);
 	}
 

--- freeswitch/trunk/src/switch_ivr_bridge.c	2009-11-03 10:48:23 UTC (rev 15328)
+++ freeswitch/trunk/src/switch_ivr_bridge.c	2009-11-03 16:50:16 UTC (rev 15329)
@@ -850,6 +850,9 @@
 		return SWITCH_STATUS_FALSE;
 	}
 
+	switch_channel_set_flag_recursive(caller_channel, CF_SIGNAL_BRIDGE_TTL);
+	switch_channel_set_flag_recursive(peer_channel, CF_SIGNAL_BRIDGE_TTL);
+
 	switch_channel_set_variable(caller_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, switch_core_session_get_uuid(peer_session));
 	switch_channel_set_variable(peer_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, switch_core_session_get_uuid(session));
 
@@ -921,6 +924,10 @@
 		return switch_ivr_signal_bridge(session, peer_session);
 	}
 	
+
+	switch_channel_set_flag_recursive(caller_channel, CF_MEDIA_BRIDGE_TTL);
+	switch_channel_set_flag_recursive(peer_channel, CF_MEDIA_BRIDGE_TTL);
+
 	switch_channel_set_flag_recursive(caller_channel, CF_BRIDGE_ORIGINATOR);
 	switch_channel_clear_flag(peer_channel, CF_BRIDGE_ORIGINATOR);