diff options
| author | Mark Spencer <markster@digium.com> | 2004-05-20 16:30:10 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-05-20 16:30:10 +0000 |
| commit | 6195dd35e007e5c259bc7235f923737cda4b4ab1 (patch) | |
| tree | efbb775d4f7e80cb61b314075217774d082e881a /res/res_parking.c | |
| parent | e1b72cf020a327a560da4da52aa56e2b5fe1cd87 (diff) | |
Make ast_channel_walk become ast_channel_walk_locked
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_parking.c')
| -rwxr-xr-x | res/res_parking.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/res/res_parking.c b/res/res_parking.c index 29b63684c..e63f490cb 100755 --- a/res/res_parking.c +++ b/res/res_parking.c @@ -737,7 +737,7 @@ int ast_pickup_call(struct ast_channel *chan) { struct ast_channel *cur; int res = -1; - cur = ast_channel_walk(NULL); + cur = ast_channel_walk_locked(NULL); while(cur) { if (!cur->pbx && (cur != chan) && @@ -746,7 +746,8 @@ int ast_pickup_call(struct ast_channel *chan) (cur->_state == AST_STATE_RING))) { break; } - cur = ast_channel_walk(cur); + ast_mutex_unlock(&cur->lock); + cur = ast_channel_walk_locked(cur); } if (cur) { ast_log(LOG_DEBUG, "Call pickup on chan '%s' by '%s'\n",cur->name, chan->name); @@ -759,6 +760,7 @@ int ast_pickup_call(struct ast_channel *chan) res = ast_channel_masquerade(cur, chan); if (res) ast_log(LOG_WARNING, "Unable to masquerade '%s' into '%s'\n", chan->name, cur->name); /* Done */ + ast_mutex_unlock(&cur->lock); } else { ast_log(LOG_DEBUG, "No call pickup possible...\n"); } |