diff --git a/src/include/switch_ivr.h b/src/include/switch_ivr.h index efd9a3720e..a62d84d550 100644 --- a/src/include/switch_ivr.h +++ b/src/include/switch_ivr.h @@ -802,6 +802,8 @@ SWITCH_DECLARE(switch_say_type_t) switch_ivr_get_say_type_by_name(const char *na SWITCH_DECLARE(switch_status_t) switch_ivr_set_user(switch_core_session_t *session, const char *data); SWITCH_DECLARE(switch_status_t) switch_ivr_sound_test(switch_core_session_t *session); SWITCH_DECLARE(void) switch_process_import(switch_core_session_t *session, switch_channel_t *peer_channel, const char *varname); +SWITCH_DECLARE(switch_bool_t) switch_ivr_uuid_exists(const char *uuid); + /** @} */ SWITCH_END_EXTERN_C diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c index eee0ee82c4..1ace74388b 100644 --- a/src/mod/applications/mod_commands/mod_commands.c +++ b/src/mod/applications/mod_commands/mod_commands.c @@ -3267,18 +3267,14 @@ SWITCH_STANDARD_API(uuid_setvar_multi_function) return SWITCH_STATUS_SUCCESS; } -#define EXISTS_SYNTAX " " +#define EXISTS_SYNTAX "" SWITCH_STANDARD_API(uuid_exists_function) { - int exists = 0; - - if (cmd) { - switch_core_session_t *psession = NULL; - if ((psession = switch_core_session_locate(cmd))) { - switch_core_session_rwunlock(psession); - exists = 1; - } - } + switch_bool_t exists = SWITCH_FALSE; + + if (cmd) { + exists = switch_ivr_uuid_exists(cmd); + } stream->write_function(stream, "%s", exists ? "true" : "false"); diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c index cdd7698c22..8c2e80e60f 100644 --- a/src/mod/endpoints/mod_sofia/sofia.c +++ b/src/mod/endpoints/mod_sofia/sofia.c @@ -4247,6 +4247,14 @@ void sofia_handle_sip_i_refer(nua_t *nua, sofia_profile_t *profile, nua_handle_t br_a = switch_channel_get_variable(channel_a, SWITCH_SIGNAL_BOND_VARIABLE); br_b = switch_channel_get_variable(channel_b, SWITCH_SIGNAL_BOND_VARIABLE); + if (!switch_ivr_uuid_exists(br_a)) { + br_a = NULL; + } + + if (!switch_ivr_uuid_exists(br_b)) { + br_b = NULL; + } + if (switch_channel_test_flag(channel_b, CF_ORIGINATOR)) { switch_core_session_t *a_session; diff --git a/src/switch_ivr.c b/src/switch_ivr.c index 52997dc06e..6c84a74a51 100644 --- a/src/switch_ivr.c +++ b/src/switch_ivr.c @@ -2244,6 +2244,20 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_set_user(switch_core_session_t *sessi return status; } +SWITCH_DECLARE(switch_bool_t) switch_ivr_uuid_exists(const char *uuid) +{ + switch_bool_t exists = SWITCH_FALSE; + switch_core_session_t *psession = NULL; + + if ((psession = switch_core_session_locate(uuid))) { + switch_core_session_rwunlock(psession); + exists = 1; + } + + return exists; +} + + /* For Emacs: * Local Variables: * mode:c