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 /include | |
| 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 'include')
| -rw-r--r-- | include/asterisk/pbx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index 3e3669afb..87a594c59 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -600,7 +600,7 @@ int ast_context_remove_extension(const char *context, const char *extension, int const char *registrar); int ast_context_remove_extension2(struct ast_context *con, const char *extension, - int priority, const char *registrar); + int priority, const char *registrar, int already_locked); /*! * \brief Add an ignorepat |