FS-4049 try this

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 004b67c727fd51b8f8664cca6c167a30167f6895..5fd3a43a27b3da9913ef9901fec8290e9acfb6b7 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -272,7 +272,8 @@ typedef enum {
        SOF_FORKED_DIAL = (1 << 1),
        SOF_NO_EFFECTIVE_CID_NUM = (1 << 2),
        SOF_NO_EFFECTIVE_CID_NAME = (1 << 3),
-       SOF_NO_LIMITS = (1 << 4)
+       SOF_NO_LIMITS = (1 << 4),
+       SOF_ENTERPRISE = (1 << 5)
 } switch_originate_flag_enum_t;
 typedef uint32_t switch_originate_flag_t;
 

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 6f5752641af5eb2e2202bb62d65ea179fe700910..5e715f0ab2caee3994925ca352a30a86e207e034 100644 (file)
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -1280,7 +1280,9 @@ static void *SWITCH_THREAD_FUNC enterprise_originate_thread(switch_thread_t *thr
        enterprise_originate_handle_t *handle = (enterprise_originate_handle_t *) obj;
 
        handle->done = 0;
-       handle->status = switch_ivr_originate(NULL, &handle->bleg, &handle->cause,
+       handle->flags |= SOF_ENTERPRISE;
+
+       handle->status = switch_ivr_originate(handle->session, &handle->bleg, &handle->cause,
                                                                                  handle->bridgeto, handle->timelimit_sec,
                                                                                  handle->table,
                                                                                  handle->cid_name_override,
@@ -2709,6 +2711,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                                soft_holding = switch_channel_get_variable(caller_channel, SWITCH_SOFT_HOLDING_UUID_VARIABLE);
                        }
 
+                       if ((flags & SOF_ENTERPRISE)) {
+                               session = oglobals.session = NULL;
+                               caller_channel = NULL;
+                       }
+
+
                        while ((!caller_channel || switch_channel_ready(caller_channel) || switch_channel_test_flag(caller_channel, CF_XFER_ZOMBIE)) &&
                                   check_channel_status(&oglobals, originate_status, and_argc)) {
                                time_t elapsed = switch_epoch_time_now(NULL) - start;