kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-4049 try this

This commit is contained in:
Anthony Minessale 2012-03-27 13:08:49 -05:00
parent 2da9450a8b
commit 46810f58d3
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/switch_types.h
View File

@ -272,7 +272,8 @@ typedef enum {
SOF_FORKED_DIAL = (1 << 1), SOF_FORKED_DIAL = (1 << 1),
SOF_NO_EFFECTIVE_CID_NUM = (1 << 2), SOF_NO_EFFECTIVE_CID_NUM = (1 << 2),
SOF_NO_EFFECTIVE_CID_NAME = (1 << 3), 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; } switch_originate_flag_enum_t;
typedef uint32_t switch_originate_flag_t; typedef uint32_t switch_originate_flag_t;

10
src/switch_ivr_originate.c
View File

@ -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; enterprise_originate_handle_t *handle = (enterprise_originate_handle_t *) obj;
handle->done = 0; 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->bridgeto, handle->timelimit_sec,
handle->table, handle->table,
handle->cid_name_override, 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); 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)) && 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)) { check_channel_status(&oglobals, originate_status, and_argc)) {
time_t elapsed = switch_epoch_time_now(NULL) - start; time_t elapsed = switch_epoch_time_now(NULL) - start;