From: Gregory Nietsky Date: Wed, 21 Sep 2011 11:21:49 +0000 (+0000) Subject: Merged revisions 337263 via svnmerge from X-Git-Tag: 11.0.0-beta1~1123 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2bb0d456eb60b3c2caa89945417694e04ff29561;p=thirdparty%2Fasterisk.git Merged revisions 337263 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/10 ........ r337263 | irroot | 2011-09-21 13:15:48 +0200 (Wed, 21 Sep 2011) | 1 line Whitespace fixup from SRTP patch ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337283 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 9f18952a47..52800b17c1 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -904,7 +904,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ;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. -;encryption_taglen=80 ; Set the auth tag length offered in the INVITE either 32/80 default 80 +;encryption_taglen=80 ; Set the auth tag length offered in the INVITE either 32/80 default 80 ;----------------------------------------- REALTIME SUPPORT ------------------------ ; For additional information on ARA, the Asterisk Realtime Architecture,