Add auto_force_rport and auto_comedia NAT options
authorTerry Wilson <twilson@digium.com>
Thu, 9 Feb 2012 18:14:39 +0000 (18:14 +0000)
committerTerry Wilson <twilson@digium.com>
Thu, 9 Feb 2012 18:14:39 +0000 (18:14 +0000)
commite5c51ee44c79950ff90660f29ae4b78ce8cc06d2
tree4a25b55ca8c3dcb00699c36ec270f0ff25750ca3
parent8f5c33f95a44347308fa9987ddad0598ba060522
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
CHANGES
channels/chan_sip.c
channels/sip/config_parser.c
channels/sip/include/config_parser.h
channels/sip/include/sip.h
channels/sip/include/sip_utils.h
channels/sip/utils.c [new file with mode: 0644]
configs/sip.conf.sample