From 94fe263c6a33e28056ef956335d40b71226791aa Mon Sep 17 00:00:00 2001 From: David Vossel Date: Tue, 5 Jan 2010 19:30:44 +0000 Subject: [PATCH] Merged revisions 237839 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r237839 | dvossel | 2010-01-05 13:29:47 -0600 (Tue, 05 Jan 2010) | 19 lines fixes subscriptions being lost after 'module reload' During a module reload if multiple extension configs are present, such as both extensions.conf and extensions.ael, watchers for one config's hints will be lost during the merging of the other config. This happens because hint watchers are only preserved for the current config being merged. The old context list is destroyed after the merging takes place, meaning any watchers that were not perserved will be removed. Now all hints are preserved during merging regardless of what config file is being merged. These hints are only restored if they are present within the new context list. (closes issue #16093) Reported by: jlaroff ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@237840 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/pbx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main/pbx.c b/main/pbx.c index 9f3271cfc9..bad9620242 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -6656,12 +6656,13 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_ AST_RWLIST_WRLOCK(&hints); writelocktime = ast_tvnow(); - /* preserve all watchers for hints associated with this registrar */ + /* preserve all watchers for hints */ AST_RWLIST_TRAVERSE(&hints, hint, list) { - if (!AST_LIST_EMPTY(&hint->callbacks) && !strcmp(registrar, hint->exten->parent->registrar)) { + if (!AST_LIST_EMPTY(&hint->callbacks)) { length = strlen(hint->exten->exten) + strlen(hint->exten->parent->name) + 2 + sizeof(*this); if (!(this = ast_calloc(1, length))) continue; + /* this removes all the callbacks from the hint into this. */ AST_LIST_APPEND_LIST(&this->callbacks, &hint->callbacks, entry); this->laststate = hint->laststate; this->context = this->data; @@ -6692,7 +6693,7 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_ */ if (exten && exten->exten[0] == '_') { ast_add_extension_nolock(exten->parent->name, 0, this->exten, PRIORITY_HINT, NULL, - 0, exten->app, ast_strdup(exten->data), ast_free_ptr, registrar); + 0, exten->app, ast_strdup(exten->data), ast_free_ptr, exten->registrar); /* rwlocks are not recursive locks */ exten = ast_hint_extension_nolock(NULL, this->context, this->exten); }