From 7e193ed3827edf4534bf63167d3fb071a799ec1f Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Wed, 16 May 2012 02:41:24 +0000 Subject: [PATCH] Revert "disable these options if zrtp isn't enabled" Brian and I talked about this and concurred on the reversion here. Part of the point of the ZRTP pass-through mode code is that it allows two legs to have a ZRTP-enabled call even if FS doesn't have ZRTP. This reverts commit f0aa4ab390b1f905ec1d99f689bfec6215308dcd. --- src/switch_channel.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/switch_channel.c b/src/switch_channel.c index 806f5f0d82..20734d04f4 100644 --- a/src/switch_channel.c +++ b/src/switch_channel.c @@ -2952,7 +2952,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready_value(swi return SWITCH_STATUS_FALSE; } -#ifdef ENABLE_ZRTP SWITCH_DECLARE(void) switch_channel_check_zrtp(switch_channel_t *channel) { @@ -3001,7 +3000,7 @@ SWITCH_DECLARE(void) switch_channel_check_zrtp(switch_channel_t *channel) } } } -#endif + @@ -3014,9 +3013,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_pre_answered(switch_ const char *uuid; switch_core_session_t *other_session; -#ifdef ENABLE_ZRTP switch_channel_check_zrtp(channel); -#endif switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_NOTICE, "Pre-Answer %s!\n", channel->name); switch_channel_set_flag(channel, CF_EARLY_MEDIA); switch_channel_set_callstate(channel, CCS_EARLY); @@ -3276,9 +3273,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_answered(switch_chan switch_mutex_unlock(channel->profile_mutex); } -#ifdef ENABLE_ZRTP switch_channel_check_zrtp(channel); -#endif switch_channel_set_flag(channel, CF_ANSWERED); switch_channel_set_callstate(channel, CCS_ACTIVE);