diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-20 14:04:41 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-20 14:04:41 +0000 |
commit | 78469be4d05fe0c45252a6ef15b9b01f63346524 (patch) | |
tree | f27dbd2c09f23d7f5c684ef2e1d5929c9c5059ea /main | |
parent | b725d28152fb7ae1c58320c3629ce91dead9504b (diff) |
Move the check for chan->fdno == -1 to after the zombie/hangup check.
Many users were finding that their hung up channels were staying up and
causing 100% CPU usage.
(issue #14723)
Reported by: seadweller
Patches:
14723_1-4-tip.patch uploaded by mmichelson (license 60)
Tested by: falves11, bamby
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@189277 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/channel.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/main/channel.c b/main/channel.c index 8ba8c6166..a10412fc7 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2047,6 +2047,13 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) goto done; } + /* Stop if we're a zombie or need a soft hangup */ + if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) { + if (chan->generator) + ast_deactivate_generator(chan); + goto done; + } + if (chan->fdno == -1) { #ifdef AST_DEVMODE ast_log(LOG_ERROR, "ast_read() called with no recorded file descriptor.\n"); @@ -2058,13 +2065,6 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) f = &ast_null_frame; goto done; } - - /* Stop if we're a zombie or need a soft hangup */ - if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) { - if (chan->generator) - ast_deactivate_generator(chan); - goto done; - } prestate = chan->_state; /* Read and ignore anything on the alertpipe, but read only |