March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12700 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Mar '09

21 Mar '09

Author: anthm Date: Fri Mar 20 21:31:15 2009 New Revision: 12700 Log: MODENDP-205 revert Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Mar 20 21:31:15 2009 @@ -396,8 +396,7 @@ void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt) { - const char *abs, *codec_string, *uuid; - switch_core_session_t *b_session = NULL; + const char *abs, *codec_string = NULL; const char *ocodec = NULL; if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA)) { @@ -410,17 +409,7 @@ switch_assert(tech_pvt->session != NULL); - if ((abs = switch_channel_get_variable(tech_pvt->channel, "inherit_codec")) && (switch_true(abs)) && (uuid = switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE)) != NULL && (b_session = switch_core_session_locate(uuid)) != NULL) { - switch_codec_implementation_t impl = {0}; - switch_core_session_get_read_impl(b_session, &impl); - if (impl.iananame == NULL || !(abs = switch_core_session_sprintf(tech_pvt->session, "%s@%uh", impl.iananame, impl.actual_samples_per_second))) { - abs = NULL; - } - } else { - abs = NULL; - } - - if (abs || (abs = switch_channel_get_variable(tech_pvt->channel, "absolute_codec_string"))) { + if ((abs = switch_channel_get_variable(tech_pvt->channel, "absolute_codec_string"))) { codec_string = abs; } else { if (!(codec_string = switch_channel_get_variable(tech_pvt->channel, "codec_string"))) {

1 0

[commit] r12699 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Mar '09

21 Mar '09

Author: anthm Date: Fri Mar 20 21:30:05 2009 New Revision: 12699 Log: MODENDP-205 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Mar 20 21:30:05 2009 @@ -396,7 +396,8 @@ void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt) { - const char *abs, *codec_string = NULL; + const char *abs, *codec_string, *uuid; + switch_core_session_t *b_session = NULL; const char *ocodec = NULL; if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA)) { @@ -409,7 +410,17 @@ switch_assert(tech_pvt->session != NULL); - if ((abs = switch_channel_get_variable(tech_pvt->channel, "absolute_codec_string"))) { + if ((abs = switch_channel_get_variable(tech_pvt->channel, "inherit_codec")) && (switch_true(abs)) && (uuid = switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE)) != NULL && (b_session = switch_core_session_locate(uuid)) != NULL) { + switch_codec_implementation_t impl = {0}; + switch_core_session_get_read_impl(b_session, &impl); + if (impl.iananame == NULL || !(abs = switch_core_session_sprintf(tech_pvt->session, "%s@%uh", impl.iananame, impl.actual_samples_per_second))) { + abs = NULL; + } + } else { + abs = NULL; + } + + if (abs || (abs = switch_channel_get_variable(tech_pvt->channel, "absolute_codec_string"))) { codec_string = abs; } else { if (!(codec_string = switch_channel_get_variable(tech_pvt->channel, "codec_string"))) {

1 0

[commit] r12698 - freeswitch/trunk/src/include
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: mikej Date: Fri Mar 20 18:01:20 2009 New Revision: 12698 Log: fix macros with missing ( ) Modified: freeswitch/trunk/src/include/switch_utils.h Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Mar 20 18:01:20 2009 @@ -114,22 +114,22 @@ \return true or false */ #define switch_true(expr)\ -(expr && ( !strcasecmp(expr, "yes") ||\ +((expr && ( !strcasecmp(expr, "yes") ||\ !strcasecmp(expr, "on") ||\ !strcasecmp(expr, "true") ||\ !strcasecmp(expr, "enabled") ||\ !strcasecmp(expr, "active") ||\ !strcasecmp(expr, "allow") ||\ -atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE +atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE) #define switch_true_buf(expr)\ -(( !strcasecmp(expr, "yes") ||\ +((( !strcasecmp(expr, "yes") ||\ !strcasecmp(expr, "on") ||\ !strcasecmp(expr, "true") ||\ !strcasecmp(expr, "enabled") ||\ !strcasecmp(expr, "active") ||\ !strcasecmp(expr, "allow") ||\ -atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE +atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE) /*! \brief Evaluate the falsefullness of a string expression @@ -137,13 +137,13 @@ \return true or false */ #define switch_false(expr)\ -(expr && ( !strcasecmp(expr, "no") ||\ +((expr && ( !strcasecmp(expr, "no") ||\ !strcasecmp(expr, "off") ||\ !strcasecmp(expr, "false") ||\ !strcasecmp(expr, "disabled") ||\ !strcasecmp(expr, "inactive") ||\ !strcasecmp(expr, "disallow") ||\ -!atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE +!atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE) /*!

1 0

[commit] r12697 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: mikej Date: Fri Mar 20 17:49:01 2009 New Revision: 12697 Log: fix edge case segfault Modified: freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Mar 20 17:49:01 2009 @@ -448,11 +448,10 @@ if (rh->fh) { switch_core_file_close(rh->fh); - } - - if (rh->fh->samples_out < read_impl.samples_per_second * 3) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Discarding short file %s\n", rh->file); - switch_file_remove(rh->file, switch_core_session_get_pool(session)); + if (rh->fh->samples_out < read_impl.samples_per_second * 3) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Discarding short file %s\n", rh->file); + switch_file_remove(rh->file, switch_core_session_get_pool(session)); + } } }

1 0

[commit] r12696 - in freeswitch/trunk/src: . mod/applications/mod_lcr
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: mikej Date: Fri Mar 20 17:38:38 2009 New Revision: 12696 Log: fix windows build Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c freeswitch/trunk/src/switch_core_port_allocator.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Fri Mar 20 17:38:38 2009 @@ -527,6 +527,7 @@ switch_bool_t lookup_status; switch_channel_t *channel; char *id_str; + char *safe_sql; digits_copy = string_digitsonly(cb_struct->pool, digits); if (switch_strlen_zero(digits_copy)) { @@ -558,7 +559,6 @@ } /* set up the query to be executed */ - char *safe_sql; /* format the custom_sql */ safe_sql = format_custom_sql(profile->custom_sql, cb_struct, digits_copy); Modified: freeswitch/trunk/src/switch_core_port_allocator.c ============================================================================== --- freeswitch/trunk/src/switch_core_port_allocator.c (original) +++ freeswitch/trunk/src/switch_core_port_allocator.c Fri Mar 20 17:38:38 2009 @@ -118,7 +118,7 @@ int odd = switch_test_flag(alloc, SPF_ODD); switch_mutex_lock(alloc->mutex); - srand((unsigned)(intptr_t)port_ptr + (unsigned)(intptr_t)switch_thread_self() + switch_micro_time_now()); + srand((unsigned)((unsigned)(intptr_t)port_ptr + (unsigned)(intptr_t)switch_thread_self() + switch_micro_time_now())); while (alloc->track_used < alloc->track_len) { uint32_t index;

1 0

[commit] r12695 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Fri Mar 20 17:03:43 2009 New Revision: 12695 Log: fix itty bitty leak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Mar 20 17:03:43 2009 @@ -3984,7 +3984,7 @@ su_addrinfo_t *my_addrinfo = msg_addrinfo(nua_current_request(nua)); int network_port = 0; char *is_nat = NULL; - char *acl_token = NULL; + char acl_token[512] = ""; if (sess_count >= sess_max || !sofia_test_pflag(profile, PFLAG_RUNNING)) { nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); @@ -4060,11 +4060,11 @@ if (ok) { if (token) { - acl_token = strdup(token); + switch_set_string(acl_token, token); } if (sofia_test_pflag(profile, PFLAG_AUTH_CALLS)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IP %s Approved by acl \"%s[%s]\". Access Granted.\n", - network_ip, switch_str_nil(last_acl), switch_str_nil(acl_token)); + network_ip, switch_str_nil(last_acl), acl_token); is_auth = 1; } } else { @@ -4123,7 +4123,7 @@ channel = tech_pvt->channel = switch_core_session_get_channel(session); - if (acl_token) { + if (*acl_token) { switch_channel_set_variable(channel, "acl_token", acl_token); if (strchr(acl_token, '@')) { if (switch_ivr_set_user(session, acl_token) == SWITCH_STATUS_SUCCESS) { @@ -4132,8 +4132,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Error Authenticating user %s\n", acl_token); } } - free(acl_token); - acl_token = NULL; } if (sip->sip_contact && sip->sip_contact->m_url) {

1 0

[commit] r12694 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: brian Date: Fri Mar 20 16:31:04 2009 New Revision: 12694 Log: gcc sux today Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Mar 20 16:31:04 2009 @@ -2420,8 +2420,8 @@ } switch_snprintf(id, sizeof(id), "%d", holder->rows); - - switch_xml_set_attr_d(holder->xml, "row_id", id); + + switch_xml_set_attr(switch_xml_set_flag(row, SWITCH_XML_DUP), strdup("row_id"), strdup(id)); for (x = 0; x < argc; x++) { char *name = columnNames[x]; @@ -2687,7 +2687,7 @@ char *xmlstr; switch_snprintf(count, sizeof(count), "%d", holder.count); - switch_xml_set_attr_d(holder.xml, "row_count", count); + switch_xml_set_attr(switch_xml_set_flag(holder.xml, SWITCH_XML_DUP), strdup("row_count"), strdup(count)); xmlstr = switch_xml_toxml(holder.xml, SWITCH_FALSE); if (xmlstr) {

1 0

[commit] r12693 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Fri Mar 20 15:51:19 2009 New Revision: 12693 Log: another regression Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Mar 20 15:51:19 2009 @@ -309,8 +309,6 @@ switch_event_header_t *hi; char *bye_headers = NULL; - sofia_set_flag_locked(tech_pvt, TFLAG_BYE); - SWITCH_STANDARD_STREAM(stream); if ((hi = switch_channel_variable_first(channel))) { for (; hi; hi = hi->next) { @@ -342,22 +340,25 @@ switch_channel_set_variable(channel, "sip_hangup_disposition", "send_bye"); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending BYE to %s\n", switch_channel_get_name(channel)); - nua_bye(tech_pvt->nh, - SIPTAG_REASON_STR(reason), - TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), - TAG_END()); + if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) { + nua_bye(tech_pvt->nh, + SIPTAG_REASON_STR(reason), + TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), + TAG_END()); + } } else { if (switch_channel_test_flag(channel, CF_OUTBOUND)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending CANCEL to %s\n", switch_channel_get_name(channel)); if (!tech_pvt->got_bye) { switch_channel_set_variable(channel, "sip_hangup_disposition", "send_cancel"); } - - nua_cancel(tech_pvt->nh, - SIPTAG_REASON_STR(reason), - TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), - TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), - TAG_END()); + if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) { + nua_cancel(tech_pvt->nh, + SIPTAG_REASON_STR(reason), + TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), + TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), + TAG_END()); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding to INVITE with: %d\n", sip_cause); if (!tech_pvt->got_bye) { @@ -372,7 +373,7 @@ } } - + sofia_set_flag_locked(tech_pvt, TFLAG_BYE); switch_safe_free(stream.data); }

1 0

[commit] r12692 - in freeswitch/trunk/src: . mod/applications/mod_commands
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Fri Mar 20 15:41:30 2009 New Revision: 12692 Log: fix xml code to dup the values instead of store direct pointers (scope issue) Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Mar 20 15:41:30 2009 @@ -2420,8 +2420,8 @@ } switch_snprintf(id, sizeof(id), "%d", holder->rows); - - switch_xml_set_attr(switch_xml_set_flag(row, SWITCH_XML_DUP), strdup("row_id"), strdup(id)); + + switch_xml_set_attr_d(holder->xml, "row_id", id); for (x = 0; x < argc; x++) { char *name = columnNames[x]; @@ -2687,7 +2687,7 @@ char *xmlstr; switch_snprintf(count, sizeof(count), "%d", holder.count); - switch_xml_set_attr(switch_xml_set_flag(holder.xml, SWITCH_XML_DUP), strdup("row_count"), strdup(count)); + switch_xml_set_attr_d(holder.xml, "row_count", count); xmlstr = switch_xml_toxml(holder.xml, SWITCH_FALSE); if (xmlstr) { Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Mar 20 15:41:30 2009 @@ -1634,67 +1634,67 @@ if (!(param = switch_xml_add_child_d(xml, "username", off++))) { return -1; } - switch_xml_set_txt(param, caller_profile->username); + switch_xml_set_txt_d(param, caller_profile->username); if (!(param = switch_xml_add_child_d(xml, "dialplan", off++))) { return -1; } - switch_xml_set_txt(param, caller_profile->dialplan); + switch_xml_set_txt_d(param, caller_profile->dialplan); if (!(param = switch_xml_add_child_d(xml, "caller_id_name", off++))) { return -1; } - switch_xml_set_txt(param, caller_profile->caller_id_name); + switch_xml_set_txt_d(param, caller_profile->caller_id_name); if (!(param = switch_xml_add_child_d(xml, "ani", off++))) { return -1; } - switch_xml_set_txt(param, caller_profile->ani); + switch_xml_set_txt_d(param, caller_profile->ani); if (!(param = switch_xml_add_child_d(xml, "aniii", off++))) { return -1; } - switch_xml_set_txt(param, caller_profile->aniii); + switch_xml_set_txt_d(param, caller_profile->aniii); if (!(param = switch_xml_add_child_d(xml, "caller_id_number", off++))) { return -1; } - switch_xml_set_txt(param, caller_profile->caller_id_number); + switch_xml_set_txt_d(param, caller_profile->caller_id_number); if (!(param = switch_xml_add_child_d(xml, "network_addr", off++))) { return -1; } - switch_xml_set_txt(param, caller_profile->network_addr); + switch_xml_set_txt_d(param, caller_profile->network_addr); if (!(param = switch_xml_add_child_d(xml, "rdnis", off++))) { return -1; } - switch_xml_set_txt(param, caller_profile->rdnis); + switch_xml_set_txt_d(param, caller_profile->rdnis); if (!(param = switch_xml_add_child_d(xml, "destination_number", off++))) { return -1; } - switch_xml_set_txt(param, caller_profile->destination_number); + switch_xml_set_txt_d(param, caller_profile->destination_number); if (!(param = switch_xml_add_child_d(xml, "uuid", off++))) { return -1; } - switch_xml_set_txt(param, caller_profile->uuid); + switch_xml_set_txt_d(param, caller_profile->uuid); if (!(param = switch_xml_add_child_d(xml, "source", off++))) { return -1; } - switch_xml_set_txt(param, caller_profile->source); + switch_xml_set_txt_d(param, caller_profile->source); if (!(param = switch_xml_add_child_d(xml, "context", off++))) { return -1; } - switch_xml_set_txt(param, caller_profile->context); + switch_xml_set_txt_d(param, caller_profile->context); if (!(param = switch_xml_add_child_d(xml, "chan_name", off++))) { return -1; } - switch_xml_set_txt(param, caller_profile->chan_name); + switch_xml_set_txt_d(param, caller_profile->chan_name); return off; }

1 0

[commit] r12691 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Fri Mar 20 15:40:30 2009 New Revision: 12691 Log: add transfer_after_bridge magic var Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Mar 20 15:40:30 2009 @@ -160,6 +160,7 @@ #define SWITCH_LOCAL_VIDEO_PORT_VARIABLE "local_video_port" #define SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE "hangup_after_bridge" #define SWITCH_PARK_AFTER_BRIDGE_VARIABLE "park_after_bridge" +#define SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE "transfer_after_bridge" #define SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE "exec_after_bridge_app" #define SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE "exec_after_bridge_arg" #define SWITCH_MAX_FORWARDS_VARIABLE "max_forwards" Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Mar 20 15:40:30 2009 @@ -456,11 +456,27 @@ return NULL; } +static void transfer_after_bridge(switch_core_session_t *session, const char *where) +{ + int argc; + char *argv[4] = { 0 }; + char *mydata; + + if (!switch_strlen_zero(where) && (mydata = switch_core_session_strdup(session, where))) { + if ((argc = switch_separate_string(mydata, ':', argv, (sizeof(argv) / sizeof(argv[0])))) >= 1) { + switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No extension specified.\n"); + } + } +} + static switch_status_t audio_bridge_on_exchange_media(switch_core_session_t *session) { switch_channel_t *channel = switch_core_session_get_channel(session); switch_ivr_bridge_data_t *bd = switch_channel_get_private(channel, "_bridge_"); switch_channel_state_t state; + const char *var; if (bd) { switch_channel_set_private(channel, "_bridge_", NULL); @@ -479,6 +495,8 @@ if (state < CS_HANGUP && switch_true(switch_channel_get_variable(channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE))) { switch_ivr_park_session(session); + } else if (state < CS_HANGUP && (var = switch_channel_get_variable(channel, SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE))) { + transfer_after_bridge(session, var); } else { if (!switch_channel_test_flag(channel, CF_TRANSFER) && !switch_channel_test_flag(channel, CF_REDIRECT) && bd && !bd->clean_exit && state != CS_PARK && state != CS_ROUTING && !switch_channel_test_flag(channel, CF_INNER_BRIDGE)) { @@ -808,6 +826,7 @@ switch_event_t *event; int br = 0; int inner_bridge = switch_channel_test_flag(caller_channel, CF_INNER_BRIDGE); + const char *var; switch_channel_set_flag(caller_channel, CF_ORIGINATOR); @@ -971,6 +990,8 @@ (switch_channel_test_flag(peer_channel, CF_ANSWERED) && state < CS_HANGUP)) { if (switch_true(switch_channel_get_variable(caller_channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE))) { switch_ivr_park_session(session); + } else if ((var = switch_channel_get_variable(caller_channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE))) { + transfer_after_bridge(session, var); } else if (switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel)); }

1 0