[asterisk-commits] kpfleming: trunk r348518 - in /trunk: ./ configs/sip.conf.sample

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Sun Dec 18 12:29:47 2011
New Revision: 348518

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

Merged revisions 348516 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 348517 from http://svn.asterisk.org/svn/asterisk/branches/10

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-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=348518&r1=348517&r2=348518
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Sun Dec 18 12:29:47 2011
@@ -811,8 +811,8 @@
 ; 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.
 ;
@@ -829,7 +829,7 @@
 ; 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