diff options
| author | Steve Murphy <murf@digium.com> | 2008-06-16 20:43:46 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2008-06-16 20:43:46 +0000 |
| commit | f4c85ebd229e87762b96a1713d9b6ac11d4b2ab1 (patch) | |
| tree | 5a167c96702022ee82db6e25d50ebef659661b6f /apps | |
| parent | 39606a9c642df775cb6869de3b1b701311e0ad5a (diff) | |
(closes issue #12689)
Reported by: ys
Many thanks to ys for doing the research on this problem.
I didn't think it would be best to unlock the contexts
and then relock them after the remove_extension2() call,
so I added an extra arg to remove_extension2() and set it
appropriately in each call. There were not that many.
I considered forcing the code to lock the contexts before
the call to remove_extension2(), but that would require
a slightly greater degree of changes, especially since
the find_context_locked is local to pbx.c
I did a simple sanity test to make sure the code doesn't
mess things up in general.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@123165 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_dial.c | 2 | ||||
| -rw-r--r-- | apps/app_queue.c | 2 | ||||
| -rw-r--r-- | apps/app_stack.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 490fa3414..abd6b4727 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -2098,7 +2098,7 @@ static int unload_module(void) res |= ast_unregister_application(rapp); if ((con = ast_context_find("app_dial_gosub_virtual_context"))) { - ast_context_remove_extension2(con, "s", 1, NULL); + ast_context_remove_extension2(con, "s", 1, NULL, 0); ast_context_destroy(con, "app_dial"); /* leave nothing behind */ } diff --git a/apps/app_queue.c b/apps/app_queue.c index 5e7289ae0..6d40c3976 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -6366,7 +6366,7 @@ static int unload_module(void) ast_event_unsubscribe(device_state_sub); if ((con = ast_context_find("app_queue_gosub_virtual_context"))) { - ast_context_remove_extension2(con, "s", 1, NULL); + ast_context_remove_extension2(con, "s", 1, NULL, 0); ast_context_destroy(con, "app_queue"); /* leave no trace */ } diff --git a/apps/app_stack.c b/apps/app_stack.c index 562be8ac9..669f7f4e7 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -496,7 +496,7 @@ static int unload_module(void) ast_agi_unregister(ast_module_info->self, &gosub_agi_command); if ((con = ast_context_find("app_stack_gosub_virtual_context"))) { - ast_context_remove_extension2(con, "s", 1, NULL); + ast_context_remove_extension2(con, "s", 1, NULL, 0); ast_context_destroy(con, "app_stack"); /* leave nothing behind */ } } |