aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-07 20:17:08 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-07 20:17:08 +0000
commit95e89b34f56f222d595161313e9ab28f3481b17e (patch)
tree6cd2af69a1151179ca69c82123ba7b4e5c5ea38b
parent98590edc410d5eccdcafdecc540c0d7e9a3f233d (diff)
Merged revisions 211113 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r211113 | russell | 2009-08-07 15:12:21 -0500 (Fri, 07 Aug 2009) | 11 lines Recorded merge of revisions 211112 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r211112 | russell | 2009-08-07 15:11:31 -0500 (Fri, 07 Aug 2009) | 4 lines Resolve a deadlock involving app_chanspy and masquerades. (ABE-1936) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@211115 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_chanspy.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index ee88d95ca..8340f7e12 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -552,17 +552,20 @@ static const struct ast_datastore_info chanspy_ds_info = {
static struct chanspy_ds *chanspy_ds_free(struct chanspy_ds *chanspy_ds)
{
- if (!chanspy_ds)
+ struct ast_channel *chan;
+
+ if (!chanspy_ds) {
return NULL;
+ }
ast_mutex_lock(&chanspy_ds->lock);
- if (chanspy_ds->chan) {
+ while ((chan = chanspy_ds->chan)) {
struct ast_datastore *datastore;
- struct ast_channel *chan;
-
- chan = chanspy_ds->chan;
- ast_channel_lock(chan);
+ if (ast_channel_trylock(chan)) {
+ DEADLOCK_AVOIDANCE(&chanspy_ds->lock);
+ continue;
+ }
if ((datastore = ast_channel_datastore_find(chan, &chanspy_ds_info, chanspy_ds->unique_id))) {
ast_channel_datastore_remove(chan, datastore);
/* chanspy_ds->chan is NULL after this call */
@@ -571,6 +574,7 @@ static struct chanspy_ds *chanspy_ds_free(struct chanspy_ds *chanspy_ds)
ast_datastore_free(datastore);
}
ast_channel_unlock(chan);
+ break;
}
ast_mutex_unlock(&chanspy_ds->lock);