[svn-commits] russell: branch 1.6.0 r207362 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Jul 20 11:37:54 2009
New Revision: 207362

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=207362
Log:
Merged revisions 207361 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r207361 | russell | 2009-07-20 11:36:15 -0500 (Mon, 20 Jul 2009) | 16 lines
  
  Merged revisions 207360 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r207360 | russell | 2009-07-20 11:26:24 -0500 (Mon, 20 Jul 2009) | 9 lines
    
    Only do the chan->fdno check in ast_read() in a developer build.
    
    I changed this check to only happen in a dev-mode build.  I also added a
    comment explaining what is going on.  I also made it so that detection of
    this situation does not affect ast_read() operation.
    
    (closes issue #14723)
    Reported by: seadweller
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/channel.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=207362&r1=207361&r2=207362
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Mon Jul 20 11:37:54 2009
@@ -2581,15 +2581,20 @@
 		goto done;
 	}
 
+#ifdef AST_DEVMODE
+	/* 
+	 * The ast_waitfor() code records which of the channel's file descriptors reported that
+	 * data is available.  In theory, ast_read() should only be called after ast_waitfor()
+	 * reports that a channel has data available for reading.  However, there still may be
+	 * some edge cases throughout the code where ast_read() is called improperly.  This can
+	 * potentially cause problems, so if this is a developer build, make a lot of noise if
+	 * this happens so that it can be addressed. 
+	 */
 	if (chan->fdno == -1) {
-#ifdef AST_DEVMODE
 		ast_log(LOG_ERROR, "ast_read() called with no recorded file descriptor.\n");
-#else
-		ast_debug(2, "ast_read() called with no recorded file descriptor.\n");
+	}
 #endif
-		f = &ast_null_frame;
-		goto done;
-	}
+
 	prestate = chan->_state;
 
 	/* Read and ignore anything on the alertpipe, but read only