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 /main/features.c | |
| 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 'main/features.c')
| -rw-r--r-- | main/features.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/features.c b/main/features.c index 06b0a3ca6..ccd182d21 100644 --- a/main/features.c +++ b/main/features.c @@ -2465,7 +2465,7 @@ int manage_parkinglot(struct ast_parkinglot *curlot, fd_set *rfds, fd_set *efds, /* And take them out of the parking lot */ con = ast_context_find(pu->parkinglot->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 parking extension!\n"); else notify_metermaids(pu->parkingexten, curlot->parking_con, AST_DEVICE_NOT_INUSE); @@ -2500,7 +2500,7 @@ int manage_parkinglot(struct ast_parkinglot *curlot, fd_set *rfds, fd_set *efds, /* And take them out of the parking lot */ con = ast_context_find(curlot->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, curlot->parking_con, AST_DEVICE_NOT_INUSE); @@ -2721,7 +2721,7 @@ static int park_exec_full(struct ast_channel *chan, void *data, struct ast_parki peer = pu->chan; con = ast_context_find(parkinglot->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, parkinglot->parking_con, AST_DEVICE_NOT_INUSE); @@ -3284,7 +3284,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); } |