From: Anthony Minessale <anthm@freeswitch.org>
Date: Mon, 21 Nov 2011 19:52:28 +0000 (-0600)
Subject: FS-3688 update and repeat tests (part 2)
X-Git-Tag: v1.2-rc1~27^2~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68627e86acf441c1e5551e090c7e5571f2e619a3;p=thirdparty%2Ffreeswitch.git

FS-3688 update and repeat tests (part 2)
---

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 6f4f5f1034..9bba10ff31 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -4919,10 +4919,15 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
 		}
 
 
-		if (sip->sip_payload && sip->sip_payload->pl_data && switch_stristr("m=image", sip->sip_payload->pl_data)) {
+		if (!switch_channel_test_flag(channel, CF_PROXY_MODE) && 
+			sip->sip_payload && sip->sip_payload->pl_data && switch_stristr("m=image", sip->sip_payload->pl_data)) {
 			has_t38 = 1;
 		}
 		
+		if (switch_channel_test_flag(channel, CF_PROXY_MODE)) {
+			sofia_clear_flag(tech_pvt, TFLAG_T38_PASSTHRU);
+		}
+
 		if (switch_channel_test_flag(channel, CF_PROXY_MODE) || 
 			switch_channel_test_flag(channel, CF_PROXY_MEDIA) || 
 			(sofia_test_flag(tech_pvt, TFLAG_T38_PASSTHRU) && (has_t38 || status > 299))) {
@@ -4942,7 +4947,7 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
 						r_sdp = tech_pvt->remote_sdp_str;
 						sofia_glue_tech_proxy_remote_addr(tech_pvt, NULL);
 					}
-
+					
 					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Passing %d %s to other leg\n", status, phrase);
 
 					if (status > 299) {