diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2005-11-30 03:16:53 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2005-11-30 03:16:53 +0000 |
commit | 66ddc1dd5f43daa8470b6bded653fb0bc8608095 (patch) | |
tree | 6979f4fc238de98eef4574d4db0ffe073bd4a940 /channel.c | |
parent | 350287ea0875f668a5a4a0c520fd4b7e96ffc9b6 (diff) |
free write frames when spy queues provide frames that don't need to be dup'd
properly lock and trigger spies when detaching them en masse
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7223 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -1016,8 +1016,13 @@ void ast_channel_spy_stop_by_type(struct ast_channel *chan, const char *type) return; AST_LIST_TRAVERSE(&chan->spies->list, spy, list) { - if ((spy->type == type) && (spy->status == CHANSPY_RUNNING)) + ast_mutex_lock(&spy->lock); + if ((spy->type == type) && (spy->status == CHANSPY_RUNNING)) { spy->status = CHANSPY_DONE; + if (ast_test_flag(spy, CHANSPY_TRIGGER_MODE) != CHANSPY_TRIGGER_NONE) + ast_cond_signal(&spy->trigger); + } + ast_mutex_unlock(&spy->lock); } } @@ -3912,8 +3917,10 @@ struct ast_frame *ast_channel_spy_read_frame(struct ast_channel_spy *spy, unsign if (need_dup) result = ast_frdup(read_frame); - else + else { result = read_frame; + ast_frfree(write_frame); + } } else { if (need_dup) { result = ast_frdup(read_frame); |