[Freeswitch-svn] [commit] r11616 - freeswitch/trunk/src

[FreeSWITCH SVN]

Author: anthm
Date: Tue Feb  3 14:33:24 2009
New Revision: 11616

Log:
tweaks to call setup code

Modified:
   freeswitch/trunk/src/switch_channel.c
   freeswitch/trunk/src/switch_ivr.c
   freeswitch/trunk/src/switch_ivr_originate.c

Modified: freeswitch/trunk/src/switch_channel.c
==============================================================================
--- freeswitch/trunk/src/switch_channel.c	(original)
+++ freeswitch/trunk/src/switch_channel.c	Tue Feb  3 14:33:24 2009
@@ -1623,8 +1623,6 @@
 {
 	switch_event_t *event;
 
-	switch_channel_perform_mark_ring_ready(channel, file, func, line);
-
 	if (!switch_channel_test_flag(channel, CF_EARLY_MEDIA)) {
 		const char *uuid;
 		switch_core_session_t *other_session;

Modified: freeswitch/trunk/src/switch_ivr.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr.c	(original)
+++ freeswitch/trunk/src/switch_ivr.c	Tue Feb  3 14:33:24 2009
@@ -54,6 +54,7 @@
 	int sval = 0;
 	const char *var;
 
+	/*
 	if (!switch_channel_test_flag(channel, CF_OUTBOUND) && !switch_channel_test_flag(channel, CF_PROXY_MODE) && 
 		!switch_channel_media_ready(channel) && !switch_channel_test_flag(channel, CF_SERVICE)) {
 		if ((status = switch_channel_pre_answer(channel)) != SWITCH_STATUS_SUCCESS) {
@@ -61,6 +62,7 @@
 			return SWITCH_STATUS_FALSE;
 		}
 	}
+	*/
 
 	if (!switch_channel_media_ready(channel)) {
 		switch_yield(ms * 1000);

Modified: freeswitch/trunk/src/switch_ivr_originate.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_originate.c	(original)
+++ freeswitch/trunk/src/switch_ivr_originate.c	Tue Feb  3 14:33:24 2009
@@ -216,7 +216,8 @@
 	switch_thread_create(&thread, thd_attr, collect_thread_run, collect, switch_core_session_get_pool(collect->session));
 }
 
-static int check_per_channel_timeouts(originate_status_t *originate_status, 
+static int check_per_channel_timeouts(originate_global_t *oglobals,
+									  originate_status_t *originate_status, 
 									  int max,
 									  time_t start)
 {
@@ -229,7 +230,7 @@
 				!(
 				  switch_channel_test_flag(originate_status[i].peer_channel, CF_RING_READY) ||
 				  switch_channel_test_flag(originate_status[i].peer_channel, CF_ANSWERED) ||
-				  switch_channel_test_flag(originate_status[i].peer_channel, CF_EARLY_MEDIA)
+				  (!oglobals->monitor_early_media_ring && switch_channel_test_flag(originate_status[i].peer_channel, CF_EARLY_MEDIA))
 				  )
 				) {
 				switch_channel_hangup(originate_status[i].peer_channel, SWITCH_CAUSE_PROGRESS_TIMEOUT);
@@ -445,7 +446,7 @@
 				if (!oglobals->progress) {
 					oglobals->progress = 1;
 				}
-			
+				
 				if (!oglobals->ring_ready && !oglobals->ignore_ring_ready) {
 					oglobals->ring_ready = 1;
 				}
@@ -1533,7 +1534,7 @@
 					switch_yield(100000);
 				}
 
-				check_per_channel_timeouts(originate_status, and_argc, start);
+				check_per_channel_timeouts(&oglobals, originate_status, and_argc, start);
 
 
 				if (valid_channels == 0) {
@@ -1662,7 +1663,7 @@
 				}
 				/* When the AND operator is being used, and fail_on_single_reject is set, a hangup indicates that the call should fail. */
 				
-				check_per_channel_timeouts(originate_status, and_argc, start);
+				check_per_channel_timeouts(&oglobals, originate_status, and_argc, start);
 
 				if (oglobals.session && switch_core_session_private_event_count(oglobals.session)) {
 					switch_ivr_parse_all_events(oglobals.session);