aboutsummaryrefslogtreecommitdiffstats
path: root/addons
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2011-05-03 23:36:35 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2011-05-03 23:36:35 +0000
commitac631c1be1cbfebfbdb2cf1c214d936f139cd57a (patch)
tree2d98abab81fb8fddc1289288fb07eea7bc20656d /addons
parent4c31171c4cb022cd5babe51a20032782c53cdd18 (diff)
If multiple [general] contexts occur from sip.conf (usually due to external includes), merge them.
The original implementation of this did the merging of all contexts with the same name in the realtime layer, but that implementation severely breaks drivers which use the same context name (e.g. iax.conf, type={peer,user}). Therefore, the implementation needs to do the merging for particular entries only, based upon what contexts would allow that in the channel driver itself. This implementation is for chan_sip only, but others could be added in the future. (closes issue #17957) Reported by: marcelloceschia Patches: chan-sip_parsing-general_branch162.patch uploaded by marcelloceschia (license 1079) Tested by: tilghman git-svn-id: http://svn.digium.com/svn/asterisk/trunk@316428 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'addons')
0 files changed, 0 insertions, 0 deletions