diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-15 16:20:47 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-15 16:20:47 +0000 |
| commit | 6a4d64e3efa12ea468993aac9388d06c167e7b37 (patch) | |
| tree | 893184ac838560b42d47dd3e9c413812c920645b /apps | |
| parent | f8295541144551635f59cd789a768764e2266591 (diff) | |
access channel locks through ast_channel_lock/unlock/trylock and not
through ast_mutex primitives.
To detect all occurrences, I have renamed the lock field in struct ast_channel
so it is clear that it shouldn't be used directly.
There are some uses in res/res_features.c (see details of the diff)
that are error prone as they try and lock two channels without
caring about the order (or without explaining why it is safe).
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89293 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_channelredirect.c | 2 | ||||
| -rw-r--r-- | apps/app_senddtmf.c | 4 | ||||
| -rw-r--r-- | apps/app_softhangup.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c index 0f654251f..6df4cb8d1 100644 --- a/apps/app_channelredirect.c +++ b/apps/app_channelredirect.c @@ -81,7 +81,7 @@ static int asyncgoto_exec(struct ast_channel *chan, void *data) res = ast_parseable_goto(chan2, args.label); - ast_mutex_unlock(&chan2->lock); + ast_channel_unlock(chan2); quit: return res; diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c index de04b0c23..f1bfee9bf 100644 --- a/apps/app_senddtmf.c +++ b/apps/app_senddtmf.c @@ -102,13 +102,13 @@ static int manager_play_dtmf(struct mansession *s, const struct message *m) } if (!digit) { astman_send_error(s, m, "No digit specified"); - ast_mutex_unlock(&chan->lock); + ast_channel_unlock(chan); return 0; } ast_senddigit(chan, *digit, 0); - ast_mutex_unlock(&chan->lock); + ast_channel_unlock(chan); astman_send_ack(s, m, "DTMF successfully queued"); return 0; diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c index b4e0ccc5f..ee6c92a05 100644 --- a/apps/app_softhangup.c +++ b/apps/app_softhangup.c @@ -104,11 +104,11 @@ static int softhangup_exec(struct ast_channel *chan, void *data) ast_log(LOG_WARNING, "Soft hanging %s up.\n", c->name); ast_softhangup(c, AST_SOFTHANGUP_EXPLICIT); if (!ast_test_flag(&flags, OPTION_ALL)) { - ast_mutex_unlock(&c->lock); + ast_channel_unlock(c); break; } } - ast_mutex_unlock(&c->lock); + ast_channel_unlock(c); } return 0; |