(closes issue #12960)

Reported by: mnicholson

Spent most of the day on this bug, and the
solution was so simple. Just had to find and
understand the problem.

The problem was, that the routine to copy
the existing switches, includes, and ignorepats
from the old context to the new one, wasn't
getting called when the context is already
existent. (In other words, if AEL is adding
a new context to the mix, they get copied,
but if pbx_config already defined a context,
then the copy wasn't happening. This made
no sense, so I moved the call to copy the
includes & etc, no matter the case.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@131129 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/pbx.c b/main/pbx.c
index b8798a508547acd8eeec47f4cd21e73400c7e689..643561a4d35d3f2eab9c2144b25eb74a0ab6d80c 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -4117,6 +4117,7 @@ int ast_context_remove_include2(struct ast_context *con, const char *include, co
                if (!strcmp(i->name, include) &&
                                (!registrar || !strcmp(i->registrar, registrar))) {
                        /* remove from list */
+                       ast_verb(3, "Removing inclusion of context '%s' in context '%s; registrar=%s'\n", include, ast_get_context_name(con), registrar);
                        if (pi)
                                pi->next = i->next;
                        else
@@ -4171,6 +4172,7 @@ int ast_context_remove_switch2(struct ast_context *con, const char *sw, const ch
                if (!strcmp(i->name, sw) && !strcmp(i->data, data) &&
                        (!registrar || !strcmp(i->registrar, registrar))) {
                        /* found, remove from list */
+                       ast_verb(3, "Removing switch '%s' from context '%s; registrar=%s'\n", sw, ast_get_context_name(con), registrar);
                        AST_LIST_REMOVE_CURRENT(list);
                        ast_free(i); /* free switch and return */
                        ret = 0;
@@ -5662,6 +5664,7 @@ static void context_merge_incls_swits_igps_other_registrars(struct ast_context *
        struct ast_ignorepat *ip;
        struct ast_sw *sw;
        
+       ast_verb(3, "merging incls/swits/igpats from old(%s) to new(%s) context, registrar = %s\n", ast_get_context_name(old), ast_get_context_name(new), registrar);
        /* copy in the includes, switches, and ignorepats */
        /* walk through includes */
        for (i = NULL; (i = ast_walk_context_includes(old, i)) ; ) {
@@ -5723,10 +5726,10 @@ static void context_merge(struct ast_context **extcontexts, struct ast_hashtab *
                                /* make sure the new context exists, so we have somewhere to stick this exten/prio */
                                if (!new) {
                                        new = ast_context_find_or_create(extcontexts, exttable, context->name, prio_item->registrar); /* a new context created via priority from a different context in the old dialplan, gets its registrar from the prio's registrar */
-
-                                       /* copy in the includes, switches, and ignorepats */
-                                       context_merge_incls_swits_igps_other_registrars(new, context, registrar);
                                }
+
+                               /* copy in the includes, switches, and ignorepats */
+                               context_merge_incls_swits_igps_other_registrars(new, context, registrar);
                                if (!new) {
                                        ast_log(LOG_ERROR,"Could not allocate a new context for %s in merge_and_delete! Danger!\n", context->name);
                                        return; /* no sense continuing. */