[asterisk-commits] twilson: trunk r302006 - in /trunk: ./ configs/sip.conf.sample

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Jan 17 09:06:10 2011
New Revision: 302006

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=302006
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/configs/sip.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/sip.conf.sample?view=diff&rev=302006&r1=302005&r2=302006
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Mon Jan 17 09:06:10 2011
@@ -863,6 +863,9 @@
                                 ; 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 @@
 ; unsolicited_mailbox
 ; use_q850_reason
 ; maxforwards
+; encryption
 
 ;[sip_proxy]
 ; For incoming calls only. Example: FWD (Free World Dialup)