From: Michael L. Young Date: Mon, 8 Apr 2013 19:56:45 +0000 (+0000) Subject: Blocked revisions 385008 X-Git-Tag: 11.5.0-rc1~72 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb652f9646fb0ba44b39843f9e898dbf8277583c;p=thirdparty%2Fasterisk.git Blocked revisions 385008 ........ Fix For Not Overriding The Default Settings In chan_sip The initial report was that the "nat" setting in the [general] section was not having any effect in overriding the default setting. Upon confirming that this was happening and looking into what was causing this, it was discovered that other default settings would not be overriden as well. This patch works similar to what occurs in build_peer(). We create a temporary ast_flags structure and using a mask, we override the default settings with whatever is set in the [general] section. In the bug report, the reporter who helped to test this patch noted that the directmedia settings were being overriden properly as well as the nat settings. (closes issue ASTERISK-21225) Reported by: Alexandre Vezina Tested by: Alexandre Vezina, Michael L. Young Patches: asterisk-21225-handle-options-default-prob_1.8_v4.diff.diff Michael L. Young (license 5026) Review: https://reviewboard.asterisk.org/r/2386/ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@385009 65c4cc65-6c06-0410-ace0-fbb531ad65f3 ---