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

[FreeSWITCH SVN]

Author: anthm
Date: Mon May  4 09:09:32 2009
New Revision: 13225

Log:
move originate retry related vars to only be in {} not in channel variable list

Modified:
   freeswitch/trunk/src/switch_ivr_originate.c

Modified: freeswitch/trunk/src/switch_ivr_originate.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_originate.c	(original)
+++ freeswitch/trunk/src/switch_ivr_originate.c	Mon May  4 09:09:32 2009
@@ -1048,14 +1048,8 @@
 					ok = 1;
 				} else if (!strcasecmp((char *) hi->name, "instant_ringback")) {
 					ok = 1;
-				} else if (!strcasecmp((char *) hi->name, "originate_retries")) {
-					ok = 1;
-				} else if (!strcasecmp((char *) hi->name, "originate_timeout")) {
-					ok = 1;
 				} else if (!strcasecmp((char *) hi->name, "progress_timeout")) {
 					ok = 1;
-				} else if (!strcasecmp((char *) hi->name, "originate_retry_sleep_ms")) {
-					ok = 1;
 				}
 
 				if (ok) {
@@ -1286,6 +1280,10 @@
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Originate attempt %d/%d in %d ms\n", try + 1, retries, sleep_ms);
 				if (caller_channel) {
 					switch_ivr_sleep(oglobals.session, sleep_ms, SWITCH_TRUE, NULL);
+					if (!switch_channel_ready(caller_channel)) {
+						status = SWITCH_STATUS_FALSE;
+						goto done;
+					}
 				} else {
 					switch_yield(sleep_ms * 1000);
 				}