kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 12:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 189278 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r189278 | mmichelson | 2009-04-20 09:05:27 -0500 (Mon, 20 Apr 2009) | 18 lines
  
  Merged revisions 189277 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r189277 | mmichelson | 2009-04-20 09:04:41 -0500 (Mon, 20 Apr 2009) | 12 lines
    
    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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@189280 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2009-04-20 14:06:49 +00:00
parent 06994dc3ac
commit 128d8e31b7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/channel.c
View File

@@ -2521,6 +2521,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");
@@ -2530,13 +2537,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