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 /configs | |
| 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 'configs')
| -rw-r--r-- | configs/samples/pjsip.conf.sample | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample index b3dd86a99..03066d9dc 100644 --- a/configs/samples/pjsip.conf.sample +++ b/configs/samples/pjsip.conf.sample @@ -655,6 +655,8 @@ ;media_encryption=no ; Determines whether res_pjsip will use and enforce ; usage of media encryption for this endpoint (default: ; "no") +;media_encryption_optimistic=no ; Use encryption if possible but don't fail the call + ; if not possible. ;inband_progress=no ; Determines whether chan_pjsip will indicate ringing ; using inband progress (default: "no") ;call_group= ; The numeric pickup groups for a channel (default: "") |