[asterisk-commits] mmichelson: trunk r189278 - in /trunk: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Apr 20 09:05:27 2009
New Revision: 189278

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189278
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/channel.c?view=diff&rev=189278&r1=189277&r2=189278
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon Apr 20 09:05:27 2009
@@ -2842,6 +2842,13 @@
 		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");
@@ -2849,13 +2856,6 @@
 		ast_debug(2, "ast_read() called with no recorded file descriptor.\n");
 #endif
 		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;