diff options
| author | Luigi Rizzo <rizzo@icir.org> | 2007-11-15 16:20:47 +0000 |
|---|---|---|
| committer | Luigi Rizzo <rizzo@icir.org> | 2007-11-15 16:20:47 +0000 |
| commit | 09d9cce1d8df6e181b60cd00fb1708ebe012069d (patch) | |
| tree | 893184ac838560b42d47dd3e9c413812c920645b /apps/app_softhangup.c | |
| parent | 139978dbb7388060c3d24fdd3a356744170c1ef8 (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: https://origsvn.digium.com/svn/asterisk/trunk@89293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_softhangup.c')
| -rw-r--r-- | apps/app_softhangup.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |