From 8e8b329e14ad2e4d747c4c4eb33c118305401aee Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 3 Dec 2013 17:07:29 +0000 Subject: Add channel locking for channel snapshot creation. This adds channel locks around calls to create channel snapshots as well as other functions which operate on a channel and then end up creating a channel snapshot. Functions that expect the channel to be locked prior to being called have had their documentation updated to indicate such. ........ Merged revisions 403311 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403314 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'apps/app_queue.c') diff --git a/apps/app_queue.c b/apps/app_queue.c index 906dff15f..713dba2d7 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2040,8 +2040,12 @@ static void queue_publish_multi_channel_blob(struct ast_channel *caller, struct RAII_VAR(struct ast_channel_snapshot *, caller_snapshot, NULL, ao2_cleanup); RAII_VAR(struct ast_channel_snapshot *, agent_snapshot, NULL, ao2_cleanup); + ast_channel_lock(caller); caller_snapshot = ast_channel_snapshot_create(caller); + ast_channel_unlock(caller); + ast_channel_lock(agent); agent_snapshot = ast_channel_snapshot_create(agent); + ast_channel_unlock(agent); if (!caller_snapshot || !agent_snapshot) { return; @@ -3452,7 +3456,9 @@ static int join_queue(char *queuename, struct queue_ent *qe, enum queue_result * "Queue", q->name, "Position", qe->pos, "Count", q->count); + ast_channel_lock(qe->chan); ast_channel_publish_blob(qe->chan, queue_caller_join_type(), blob); + ast_channel_unlock(qe->chan); ast_debug(1, "Queue '%s' Join, Channel '%s', Position '%d'\n", q->name, ast_channel_name(qe->chan), qe->pos ); } ao2_unlock(q); @@ -3731,7 +3737,9 @@ static void leave_queue(struct queue_ent *qe) "Queue", q->name, "Position", qe->pos, "Count", q->count); + ast_channel_lock(qe->chan); ast_channel_publish_blob(qe->chan, queue_caller_leave_type(), blob); + ast_channel_unlock(qe->chan); ast_debug(1, "Queue '%s' Leave, Channel '%s'\n", q->name, ast_channel_name(qe->chan)); /* Take us out of the queue */ if (prev) { @@ -4329,10 +4337,13 @@ static void record_abandoned(struct queue_ent *qe) "Position", qe->pos, "OriginalPosition", qe->opos, "HoldTime", (int)(time(NULL) - qe->start)); - ast_channel_publish_blob(qe->chan, queue_caller_abandon_type(), blob); qe->parent->callsabandoned++; ao2_unlock(qe->parent); + + ast_channel_lock(qe->chan); + ast_channel_publish_blob(qe->chan, queue_caller_abandon_type(), blob); + ast_channel_unlock(qe->chan); } /*! \brief RNA == Ring No Answer. Common code that is executed when we try a queue member and they don't answer. */ -- cgit v1.2.3