]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-8037: zrtp-passthru shouldn't activate unless the zrtp-hash is in the SDP.
authorBrian West <brian@freeswitch.org>
Tue, 25 Aug 2015 16:44:05 +0000 (11:44 -0500)
committerMichael Jerris <mike@jerris.com>
Tue, 25 Aug 2015 19:43:56 +0000 (14:43 -0500)
src/mod/endpoints/mod_sofia/mod_sofia.c

index 102ab0a238f2a05e7238ffeabb323bff0f514df3..63bba40c63829e62b59e1117b3d2d646b4636af7 100644 (file)
@@ -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");