From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 7 Jun 2016 22:39:35 +0000 (-0500)
Subject: FS-9219 #resolve [Re-INVITE with no SDP ] #comment use bypass_media_after_bridge_olds... 
X-Git-Tag: v1.6.9~2^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18331dd241a6c5f16b8ec00fbb7785dba1c76e70;p=thirdparty%2Ffreeswitch.git

FS-9219 #resolve [Re-INVITE with no SDP ] #comment use bypass_media_after_bridge_oldschool=true to enable back-compat bypass media after bridge
---

diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c
index 46755e3b59..62d5daf600 100644
--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@@ -552,7 +552,12 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
 			
 			if ((bypass_media_after_bridge || switch_channel_test_flag(chan_b, CF_BYPASS_MEDIA_AFTER_BRIDGE)) && switch_channel_test_flag(chan_a, CF_ANSWERED)
 				&& switch_channel_test_flag(chan_b, CF_ANSWERED)) {
-				switch_ivr_3p_nomedia(switch_core_session_get_uuid(session_a), SMF_REBRIDGE);
+
+				if (switch_true(switch_channel_get_variable_dup(chan_a, "bypass_media_after_bridge_oldschool", SWITCH_FALSE, -1))) {
+					switch_ivr_nomedia(switch_core_session_get_uuid(session_a), SMF_REBRIDGE);
+				} else {
+					switch_ivr_3p_nomedia(switch_core_session_get_uuid(session_a), SMF_REBRIDGE);
+				}
 				bypass_media_after_bridge = 0;
 				switch_channel_clear_flag(chan_b, CF_BYPASS_MEDIA_AFTER_BRIDGE);
 				goto end_of_bridge_loop;