diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-09 21:55:06 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-09 21:55:06 +0000 |
commit | a8e66dc137a198d1d429c2129ef630bee848a820 (patch) | |
tree | 75f56f11bcfbb63b11fa03eb407cf5e75404694b /main/channel.c | |
parent | 32f9ef55236ee53de4ec3ad1f6a210658f254bbb (diff) |
This commit fixes the following issues:
- Deadlock in ast_write (issue #10406)
- Deadlock in ast_read (issue #10406)
- Possible mutex initialization error in lock.h (issue #10571)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@85158 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
-rw-r--r-- | main/channel.c | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/main/channel.c b/main/channel.c index 68bc047c4..81fec223c 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2181,6 +2181,7 @@ static void ast_read_generator_actions(struct ast_channel *chan, struct ast_fram static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) { struct ast_frame *f = NULL; /* the return value */ + struct ast_channel *base = NULL; int blah; int prestate; @@ -2204,6 +2205,23 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) } prestate = chan->_state; + /* Check if there's an underlying channel */ + if (chan->tech->get_base_channel && (base = chan->tech->get_base_channel(chan)) != chan) { + int count = 0; + while (!base || ast_mutex_trylock(&base->lock)) { + if (count++ > 10) { + f = &ast_null_frame; + goto done; + } + ast_mutex_unlock(&chan->lock); + usleep(1); + ast_mutex_lock(&chan->lock); + base = chan->tech->get_base_channel(chan); + } + ast_mutex_unlock(&chan->lock); + chan = base; + } + if (!ast_test_flag(chan, AST_FLAG_DEFER_DTMF | AST_FLAG_EMULATE_DTMF | AST_FLAG_IN_DTMF) && !ast_strlen_zero(chan->dtmfq) && (ast_tvzero(chan->dtmf_tv) || ast_tvdiff_ms(ast_tvnow(), chan->dtmf_tv) > AST_MIN_DTMF_GAP) ) { @@ -2941,9 +2959,20 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr) /* and now put it through the regular translator */ f = (chan->writetrans) ? ast_translate(chan->writetrans, f, 0) : f; } - if (f) - res = chan->tech->write(chan, f); - else + if (f) { + struct ast_channel *base = NULL; + if (!chan->tech->get_base_channel || chan == chan->tech->get_base_channel(chan)) + res = chan->tech->write(chan, f); + else { + while (chan->tech->get_base_channel && (((base = chan->tech->get_base_channel(chan)) && ast_mutex_trylock(&base->lock)) || base == NULL)) { + ast_mutex_unlock(&chan->lock); + usleep(1); + ast_mutex_lock(&chan->lock); + } + res = base->tech->write(base, f); + ast_mutex_unlock(&base->lock); + } + } else res = 0; break; case AST_FRAME_NULL: |