add loopback_bowout variable (set to false to skip auto-bowout)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13162 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_loopback/mod_loopback.c b/src/mod/endpoints/mod_loopback/mod_loopback.c
index 1f8a33a9d185f2f316a709f1fe51e7060774c615..c0753850bc831642d43a3dd9743da3d45b1986b3 100644 (file)
--- a/src/mod/endpoints/mod_loopback/mod_loopback.c
+++ b/src/mod/endpoints/mod_loopback/mod_loopback.c
@@ -640,21 +640,27 @@ static switch_status_t channel_write_frame(switch_core_session_t *session, switc
                ) {
                const char *a_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE);
                const char *b_uuid = switch_channel_get_variable(tech_pvt->other_channel, SWITCH_SIGNAL_BOND_VARIABLE);
-                               
+               const char *vetoa, *vetob;
+
                switch_set_flag_locked(tech_pvt, TFLAG_BOWOUT);
                switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_BOWOUT);
+
+               vetoa = switch_channel_get_variable(tech_pvt->channel, "loopback_bowout");
+               vetob = switch_channel_get_variable(tech_pvt->other_tech_pvt->channel, "loopback_bowout");
+               
+               if ((!vetoa || switch_true(vetoa)) && (!vetob || switch_true(vetob))) {
+                       switch_clear_flag_locked(tech_pvt, TFLAG_WRITE);
+                       switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE);
+                       
+                       if (a_uuid && b_uuid) {
+                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 
+                                                                 "%s detected bridge on both ends, attempting direct connection.\n", switch_channel_get_name(channel));
                                
-               switch_clear_flag_locked(tech_pvt, TFLAG_WRITE);
-               switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE);
-                               
-               if (a_uuid && b_uuid) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 
-                                                         "%s detected bridge on both ends, attempting direct connection.\n", switch_channel_get_name(channel));
-
-                       /* channel_masquerade eat your heart out....... */
-                       switch_ivr_uuid_bridge(a_uuid, b_uuid);
-                       switch_mutex_unlock(tech_pvt->mutex);
-                       return SWITCH_STATUS_SUCCESS;
+                               /* channel_masquerade eat your heart out....... */
+                               switch_ivr_uuid_bridge(a_uuid, b_uuid);
+                               switch_mutex_unlock(tech_pvt->mutex);
+                               return SWITCH_STATUS_SUCCESS;
+                       }
                }
        }
 
@@ -675,9 +681,10 @@ static switch_status_t channel_write_frame(switch_core_session_t *session, switc
                        if (switch_queue_trypush(tech_pvt->other_tech_pvt->frame_queue, clone) != SWITCH_STATUS_SUCCESS) {
                                switch_frame_free(&clone);
                        }
+
+                       switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE);
                }
                
-               switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE);
                status = SWITCH_STATUS_SUCCESS;
        }