keep you from doing both zrtp and srtp at the same time.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13486 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index db4e9ad80be9573ce65c955474515600e4881824..9f93efc1cf1d0aeb7984f18e495c421142648be8 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -1108,6 +1108,13 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session
                switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session");
                switch_channel_t *channel = switch_core_session_get_channel(session);
                const char *zrtp_enabled = switch_channel_get_variable(channel, "zrtp_secure_media");
+               const char *srtp_enabled = switch_channel_get_variable(channel, "sip_secure_media");
+
+               if (switch_true(srtp_enabled)) {
+                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "You can not have ZRTP and SRTP enabled simultaneously, ZRTP will be disabled for this call!\n");
+                       switch_channel_set_variable(channel, "zrtp_secure_media", NULL);
+                       zrtp_enabled = NULL;
+               }
 
                if (switch_true(zrtp_enabled)) {
                        if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {