Modified: freeswitch/trunk/src/switch_ivr_bridge.c (17488 => 17489)
--- freeswitch/trunk/src/switch_ivr_bridge.c 2010-05-05 16:01:32 UTC (rev 17488)
+++ freeswitch/trunk/src/switch_ivr_bridge.c 2010-05-05 16:15:09 UTC (rev 17489)
@@ -1466,9 +1466,9 @@
{
switch_core_session_t *rsession, *bsession = NULL;
switch_channel_t *channel, *rchannel, *bchannel = NULL;
- const char *buuid;
+ const char *buuid, *var;
char brto[SWITCH_UUID_FORMATTED_LENGTH + 1] = "";
-
+
if (bleg) {
if (switch_ivr_find_bridged_uuid(uuid, brto, sizeof(brto)) == SWITCH_STATUS_SUCCESS) {
uuid = switch_core_session_strdup(session, brto);
@@ -1485,10 +1485,18 @@
channel = switch_core_session_get_channel(session);
rchannel = switch_core_session_get_channel(rsession);
+ buuid = switch_channel_get_variable(rchannel, SWITCH_SIGNAL_BOND_VARIABLE);
+ if ((var = switch_channel_get_variable(channel, "intercept_unbridged_only")) && switch_true(var)) {
+ if ((switch_channel_test_flag(rchannel, CF_BRIDGED))) {
+ switch_core_session_rwunlock(rsession);
+ return;
+ }
+ }
+
switch_channel_pre_answer(channel);
- if ((buuid = switch_channel_get_variable(rchannel, SWITCH_SIGNAL_BOND_VARIABLE))) {
+ if (!zstr(buuid)) {
if ((bsession = switch_core_session_locate(buuid))) {
bchannel = switch_core_session_get_channel(bsession);
}