diff options
| author | Steve Murphy <murf@digium.com> | 2008-03-17 17:47:36 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2008-03-17 17:47:36 +0000 |
| commit | 0af58d3f5cba858b3549d847fd84cffa62b9a6ec (patch) | |
| tree | 7feaef1754a8d06740e7a037115cb909168e1a7d /include/asterisk/pbx.h | |
| parent | 5729b0ec40f37cf98d9fb06bb5d6c683f4fa6bef (diff) | |
(closes issue #12238)
Reported by: mvanbaak
Tested by: murf, mvanbaak
Due to a bug that occurred when merge_contexts_and_delete scanned the "old" or existing contexts, and found a context
that doesn't exist in the new set, yet owned by a different registrar. The context is created in the new set, with the
old registrar, and and all the priorities and extens that have a different registrar are copied into it. But, not the
includes, ignorepats, and switches. I added code to do this immediately after the context is created.
This still leaves a logical hole in the code. If you define a context in two places, (eg. in extensions.conf and also
in extensions.ael), and they both have includes, but different in composition, no new context will be generated, and
therefore the 'old' includes, switches, and ignorepats will not be copied. I'd have added code to simply add any non-duplicates
into the 'new' context that had a different registrar, but there is one big complication: includes, and switches are definitely
order dependent. (ignorepats I'm not sure about). And we'll have to develop some sort of policy about how we
merge order dependent lists, especially if the intersection of the two sets is empty. (in other words, they do not have any
elements in common). Do the new go first, or the old? I've elected to punt this issue until a user complains. Hopefully,
this is pretty rare thing.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@109169 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/pbx.h')
| -rw-r--r-- | include/asterisk/pbx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index f7b97e8f2..1761a9bd7 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -758,6 +758,8 @@ const char *ast_get_include_name(struct ast_include *include); const char *ast_get_ignorepat_name(struct ast_ignorepat *ip); const char *ast_get_switch_name(struct ast_sw *sw); const char *ast_get_switch_data(struct ast_sw *sw); +int ast_get_switch_eval(struct ast_sw *sw); + /*! @} */ /*! @name Other Extension stuff */ |