From: Brian West <brian@freeswitch.org>
Date: Tue, 25 Aug 2015 16:44:05 +0000 (-0500)
Subject: FS-8037: zrtp-passthru shouldn't activate unless the zrtp-hash is in the SDP.
X-Git-Tag: v1.4.21~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=776e8a501a6cd240c788393b5853b85bf1235cb6;p=thirdparty%2Ffreeswitch.git

FS-8037: zrtp-passthru shouldn't activate unless the zrtp-hash is in the SDP.
---

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 102ab0a238..63bba40c63 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -4765,7 +4765,7 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session
 				sofia_clear_flag(ctech_pvt, TFLAG_ENABLE_SOA);
 			}
 
-			if (switch_channel_test_flag(o_channel, CF_ZRTP_PASSTHRU_REQ)) {
+			if (switch_channel_test_flag(o_channel, CF_ZRTP_PASSTHRU_REQ) && switch_channel_test_flag(o_channel, CF_ZRTP_HASH)) {
 				const char *x = NULL;
 				switch_core_media_pass_zrtp_hash2(session, nsession);
 				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "[zrtp_passthru] Setting a-leg inherit_codec=true\n");