diff options
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/main/channel.c b/main/channel.c index 5626e34f5..a39a3ad13 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1347,23 +1347,21 @@ static void spy_cleanup(struct ast_channel *chan) /* Detach a spy from it's channel */ static void spy_detach(struct ast_channel_spy *spy, struct ast_channel *chan) { - ast_mutex_lock(&spy->lock); - /* We only need to poke them if they aren't already done */ if (spy->status != CHANSPY_DONE) { + ast_mutex_lock(&spy->lock); /* Indicate to the spy to stop */ spy->status = CHANSPY_STOP; spy->chan = NULL; /* Poke the spy if needed */ if (ast_test_flag(spy, CHANSPY_TRIGGER_MODE) != CHANSPY_TRIGGER_NONE) ast_cond_signal(&spy->trigger); + ast_mutex_unlock(&spy->lock); } /* Print it out while we still have a lock so the structure can't go away (if signalled above) */ ast_debug(1, "Spy %s removed from channel %s\n", spy->type, chan->name); - ast_mutex_unlock(&spy->lock); - return; } @@ -1375,13 +1373,10 @@ void ast_channel_spy_stop_by_type(struct ast_channel *chan, const char *type) return; AST_LIST_TRAVERSE_SAFE_BEGIN(&chan->spies->list, spy, list) { - ast_mutex_lock(&spy->lock); if ((spy->type == type) && (spy->status == CHANSPY_RUNNING)) { - ast_mutex_unlock(&spy->lock); AST_LIST_REMOVE_CURRENT(&chan->spies->list, list); spy_detach(spy, chan); - } else - ast_mutex_unlock(&spy->lock); + } } AST_LIST_TRAVERSE_SAFE_END spy_cleanup(chan); @@ -1493,6 +1488,9 @@ static void queue_frame_to_spies(struct ast_channel *chan, struct ast_frame *f, struct ast_channel_spy_queue *queue; struct ast_frame *duped_fr; + if (spy->status != CHANSPY_RUNNING) + continue; + ast_mutex_lock(&spy->lock); queue = (dir == SPY_READ) ? &spy->read_queue : &spy->write_queue; |