Add auto_force_rport and auto_comedia NAT options

This patch adds the auto_force_rport and auto_comedia NAT options. It
also converts the nat= setting to a list of comma-separated combinable
options: no, force_rport, comedia, auto_force_rport, and auto_comedia.
nat=yes remains as an undocumented option equal to
"force_rport,comedia". The first instance of 'yes' or 'no' in the list
stops parsing and overrides any previously set options. If an auto_*
option is specified with its non-auto_ counterpart, the auto setting
takes precedence.

This patch builds upon the patch posted to ASTERISK-17860 by JIRA user
pedro-garcia.

(closes issue ASTERISK-17860)
Review: https://reviewboard.asterisk.org/r/1698/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@354597 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2012-02-09 18:14:39 +00:00
parent 8f5c33f95a
commit e5c51ee44c
8 changed files with 286 additions and 30 deletions

12
CHANGES
View File

@@ -59,6 +59,12 @@ SIP Changes
callbackextension options, incoming requests that are matched by address
will be matched to the peer with the matching callbackextension if it is
available.
* NAT settings are now a combinable list of options. The equivalent of the
deprecated nat=yes is nat=force_rport,comedia. nat=no behaves as before.
* Two new NAT options, auto_force_rport and auto_comedia, have been added
which set the force_rport and comedia options automatically if Asterisk
detects that an incoming SIP request crossed a NAT after being sent by
the remote endpoint.
Chan_local changes
------------------
@@ -125,6 +131,12 @@ AMI (Asterisk Manager Interface) changes
if the i(variable) option is used. StopMixMonitor will accept MixMonitorID as
on option to close specific MixMonitors.
* The SIPshowpeer manager action response field "SIP-Forcerport" has been updated
to include information about peers configured with nat=auto_force_rport by
returning "A" if auto_force_rport is set and nat is detected, and "a" if it is
set and nat is not detected. "Y" and "N" are still returned if auto_force_rport
is not enabled.
FAX changes
-----------
* FAXOPT(faxdetect) will enable a generic fax detect framehook for dialplan