From: Kevin P. Fleming Date: Sun, 18 Dec 2011 18:27:16 +0000 (+0000) Subject: Correct two flaws in sip.conf.sample related to AST-2011-013. X-Git-Tag: 1.8.9.0-rc1~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dbb78d45307583f37bcca587cec4866fd8ca57b;p=thirdparty%2Fasterisk.git Correct two flaws in sip.conf.sample related to AST-2011-013. * The sample file listed *two* values for the 'nat' option as being the default. Only 'force_rport' is the default. * The warning about having differing 'nat' settings confusingly referred to both peers and users. ........ Merged revisions 348515 from http://svn.asterisk.org/svn/asterisk/branches/1.6.2 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@348516 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 7f96aee7c7..1fc68fb206 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -797,8 +797,8 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; However, this is only useful if the external traffic can reach us. ; The following settings are allowed (both globally and in individual sections): ; -; nat = no ; Default. Use rport if the remote side says to use it. -; nat = force_rport ; Force rport to always be on. +; nat = no ; Use rport if the remote side says to use it. +; nat = force_rport ; Force rport to always be on. (default) ; nat = yes ; Force rport to always be on and perform comedia RTP handling. ; nat = comedia ; Use rport if the remote side says to use it and perform comedia RTP handling. ; @@ -815,7 +815,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; by outside parties as Asterisk will respond to different ports for defined and ; undefined peers. For this reason it is recommended to ONLY DEFINE NAT SETTINGS IN THE ; GENERAL SECTION. Specifically, if nat=force_rport in one section and nat=no in the -; other, then valid users with settings differing from those in the general section will +; other, then valid peers with settings differing from those in the general section will ; be discoverable. ; ; In addition to these settings, Asterisk *always* uses 'symmetric RTP' mode as defined by