diff options
| author | Joshua Colp <jcolp@digium.com> | 2014-11-19 12:50:47 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2014-11-19 12:50:47 +0000 |
| commit | 7f8b7ace724e8c67e161763b721afbb605166f0e (patch) | |
| tree | 337c1eb38fcd2174f08edb73e7efc71fa239b141 /res/res_pjsip.c | |
| parent | b2e766a6b7528224798776742cd3c22af224c862 (diff) | |
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
Diffstat (limited to 'res/res_pjsip.c')
| -rw-r--r-- | res/res_pjsip.c | 11 |
1 files changed, 11 insertions, 0 deletions
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 @@ </enumlist> </description> </configOption> + <configOption name="media_encryption_optimistic" default="no"> + <synopsis>Determines whether encryption should be used if possible but does not terminate the + session if not achieved.</synopsis> + <description><para> + This option only applies if <replaceable>media_encryption</replaceable> is + set to <literal>sdes</literal> or <literal>dtls</literal>. + </para></description> + </configOption> <configOption name="inband_progress" default="no"> <synopsis>Determines whether chan_pjsip will indicate ringing using inband progress.</synopsis> @@ -1504,6 +1512,9 @@ <parameter name="MediaEncryption"> <para><xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='endpoint']/configOption[@name='media_encryption']/synopsis/node())"/></para> </parameter> + <parameter name="MediaEncryptionOptimistic"> + <para><xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='endpoint']/configOption[@name='media_encryption_optimistic']/synopsis/node())"/></para> + </parameter> <parameter name="UseAvpf"> <para><xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='endpoint']/configOption[@name='use_avpf']/synopsis/node())"/></para> </parameter> |