aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authortwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-17 15:06:10 +0000
committertwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-17 15:06:10 +0000
commit29a38c2de1bc7dadd0bc5b6574e56c788e0590a4 (patch)
tree46ea3ddaad75fe946df62688abe5ae461a1026c3 /configs
parent16cff562b856f1cb93b3514e5a73a7cb6807519c (diff)
Merged revisions 302005 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r302005 | twilson | 2011-01-17 09:04:59 -0600 (Mon, 17 Jan 2011) | 2 lines Document "encryption" option in sip.conf.sample ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@302006 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r--configs/sip.conf.sample4
1 files changed, 4 insertions, 0 deletions
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 03008b146..c416bd239 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -863,6 +863,9 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
; also contains the Asterisk version.
;sdpowner=root ; Allows you to change the username field in the SDP owner string, (o=)
; This field MUST NOT contain spaces
+;encryption=no ; Whether to offer SRTP encrypted media (and only SRTP encrypted media)
+ ; on outgoing calls to a peer. Calls will fail with HANGUPCAUSE=58 if
+ ; the peer does not support SRTP. Defaults to no.
;----------------------------------------- REALTIME SUPPORT ------------------------
; For additional information on ARA, the Asterisk Realtime Architecture,
@@ -1091,6 +1094,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
; unsolicited_mailbox
; use_q850_reason
; maxforwards
+; encryption
;[sip_proxy]
; For incoming calls only. Example: FWD (Free World Dialup)