From 7f8b7ace724e8c67e161763b721afbb605166f0e Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 19 Nov 2014 12:50:47 +0000 Subject: res_pjsip_sdp_rtp: Add support for optimistic SRTP. Optimistic SRTP is the ability to enable SRTP but not have it be a fatal requirement. If SRTP can be used it will be, if not it won't be. This gives you a better chance of using it without having your sessions fail when it can't be. Encrypt all the things! Review: https://reviewboard.asterisk.org/r/3992/ ........ Merged revisions 428222 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@428224 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_pjsip.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'res/res_pjsip.c') diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 510be6d91..426b9d796 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -431,6 +431,14 @@ + + Determines whether encryption should be used if possible but does not terminate the + session if not achieved. + + This option only applies if media_encryption is + set to sdes or dtls. + + Determines whether chan_pjsip will indicate ringing using inband progress. @@ -1504,6 +1512,9 @@ + + + -- cgit v1.2.3