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
This commit is contained in:
Kevin P. Fleming
2011-12-18 18:27:16 +00:00
parent ec6b5be4b9
commit 6dbb78d453

View File

@@ -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