From: Terry Wilson Date: Mon, 21 Nov 2011 20:33:07 +0000 (+0000) Subject: Don't set the nat default twice. X-Git-Tag: 1.6.2.21~6^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4da96cefd774ec8339d658ec54fde9efe07576de;p=thirdparty%2Fasterisk.git Don't set the nat default twice. Cleaning up a small merge issue ASTERISK-18862 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@345827 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a9a5085078..310a69e655 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -25350,7 +25350,6 @@ static int reload_config(enum channelreloadreason reason) ast_copy_string(default_mohsuggest, DEFAULT_MOHSUGGEST, sizeof(default_mohsuggest)); ast_copy_string(default_vmexten, DEFAULT_VMEXTEN, sizeof(default_vmexten)); ast_set_flag(&global_flags[0], SIP_DTMF_RFC2833); /*!< Default DTMF setting: RFC2833 */ - ast_set_flag(&global_flags[0], SIP_NAT_RFC3581); /*!< NAT support if requested by device with rport */ ast_set_flag(&global_flags[0], SIP_DIRECT_MEDIA); /*!< Allow re-invites */ ast_set_flag(&global_flags[0], SIP_NAT_ALWAYS); /*!< Default to nat=yes */ ast_set_flag(&global_flags[1], SIP_PAGE2_FORWARD_LOOP_DETECTED); /*!< Set up call forward on 482 Loop Detected */