summaryrefslogtreecommitdiff
path: root/configs/samples
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2014-11-19 12:40:36 +0000
committerJoshua Colp <jcolp@digium.com>2014-11-19 12:40:36 +0000
commita0d9eab38997b1ba9e64f1b37f84f2fdcbde7c6e (patch)
tree12bc4f9cca486f4ea522c643d5f932ef1cf79146 /configs/samples
parent87c2e9e2387d3c1e8751e379d2ee92e855c1e85a (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/ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@428222 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs/samples')
-rw-r--r--configs/samples/pjsip.conf.sample2
1 files changed, 2 insertions, 0 deletions
diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample
index ef26f6eb0..a9b2d2b9f 100644
--- a/configs/samples/pjsip.conf.sample
+++ b/configs/samples/pjsip.conf.sample
@@ -646,6 +646,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: "")