kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 11:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 123165 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r123165 | murf | 2008-06-16 14:43:46 -0600 (Mon, 16 Jun 2008) | 19 lines

(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/branches/1.6.0@123173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2008-06-16 21:19:23 +00:00
parent 281411716a
commit 3a1b062a16
6 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_dial.c
View File

@@ -2070,7 +2070,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 */
}

2
apps/app_queue.c
View File

@@ -6217,7 +6217,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 */
}

2
apps/app_stack.c
View File

@@ -493,7 +493,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 */
}
}

2
include/asterisk/pbx.h
View File

@@ -607,7 +607,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

8
main/features.c
View File

@@ -2312,7 +2312,7 @@ static void *do_parking_thread(void *ignore)
AST_LIST_REMOVE_CURRENT(list);
con = ast_context_find(parking_con);
if (con) {
if (ast_context_remove_extension2(con, pu->parkingexten, 1, NULL))
if (ast_context_remove_extension2(con, pu->parkingexten, 1, NULL, 0))
ast_log(LOG_WARNING, "Whoa, failed to remove the extension!\n");
else
notify_metermaids(pu->parkingexten, parking_con, AST_DEVICE_NOT_INUSE);
@@ -2346,7 +2346,7 @@ static void *do_parking_thread(void *ignore)
AST_LIST_REMOVE_CURRENT(list);
con = ast_context_find(parking_con);
if (con) {
if (ast_context_remove_extension2(con, pu->parkingexten, 1, NULL))
if (ast_context_remove_extension2(con, pu->parkingexten, 1, NULL, 0))
ast_log(LOG_WARNING, "Whoa, failed to remove the extension!\n");
else
notify_metermaids(pu->parkingexten, parking_con, AST_DEVICE_NOT_INUSE);
@@ -2465,7 +2465,7 @@ static int park_exec(struct ast_channel *chan, void *data)
peer = pu->chan;
con = ast_context_find(parking_con);
if (con) {
if (ast_context_remove_extension2(con, pu->parkingexten, 1, NULL))
if (ast_context_remove_extension2(con, pu->parkingexten, 1, NULL, 0))
ast_log(LOG_WARNING, "Whoa, failed to remove the extension!\n");
else
notify_metermaids(pu->parkingexten, parking_con, AST_DEVICE_NOT_INUSE);
@@ -2850,7 +2850,7 @@ static int load_config(void)
/* Remove the old parking extension */
if (!ast_strlen_zero(old_parking_con) && (con = ast_context_find(old_parking_con))) {
if(ast_context_remove_extension2(con, old_parking_ext, 1, registrar))
if(ast_context_remove_extension2(con, old_parking_ext, 1, registrar, 0))
notify_metermaids(old_parking_ext, old_parking_con, AST_DEVICE_NOT_INUSE);
ast_debug(1, "Removed old parking extension %s@%s\n", old_parking_ext, old_parking_con);
}

16
main/pbx.c
View File

@@ -3979,7 +3979,7 @@ int ast_context_remove_extension(const char *context, const char *extension, int
struct ast_context *c = find_context_locked(context);
if (c) { /* ... remove extension ... */
ret = ast_context_remove_extension2(c, extension, priority, registrar);
ret = ast_context_remove_extension2(c, extension, priority, registrar, 1);
ast_unlock_contexts();
}
return ret;
@@ -3995,14 +3995,15 @@ int ast_context_remove_extension(const char *context, const char *extension, int
* it.
*
*/
int ast_context_remove_extension2(struct ast_context *con, const char *extension, int priority, const char *registrar)
int ast_context_remove_extension2(struct ast_context *con, const char *extension, int priority, const char *registrar, int already_locked)
{
struct ast_exten *exten, *prev_exten = NULL;
struct ast_exten *peer;
struct ast_exten ex, *exten2, *exten3;
char dummy_name[1024];
ast_wrlock_context(con);
if (!already_locked)
ast_wrlock_context(con);
/* Handle this is in the new world */
@@ -4085,7 +4086,8 @@ int ast_context_remove_extension2(struct ast_context *con, const char *extension
}
if (!exten) {
/* we can't find right extension */
ast_unlock_context(con);
if (!already_locked)
ast_unlock_context(con);
return -1;
}
@@ -4112,7 +4114,8 @@ int ast_context_remove_extension2(struct ast_context *con, const char *extension
break; /* found our priority */
}
if (!peer) { /* not found */
ast_unlock_context(con);
if (!already_locked)
ast_unlock_context(con);
return -1;
}
/* we are first priority extension? */
@@ -4145,7 +4148,8 @@ int ast_context_remove_extension2(struct ast_context *con, const char *extension
destroy_exten(peer);
/* XXX should we return -1 ? */
}
ast_unlock_context(con);
if (!already_locked)
ast_unlock_context(con);
return 0;
}