[svn-commits] file: branch 1.6.1 r179674 - in /branches/1.6.1: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue Mar  3 08:41:57 2009
New Revision: 179674

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

................
  r179672 | file | 2009-03-03 10:40:04 -0400 (Tue, 03 Mar 2009) | 10 lines
  
  Merged revisions 179671 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r179671 | file | 2009-03-03 10:38:09 -0400 (Tue, 03 Mar 2009) | 3 lines
    
    Move where fdno is set to the default value to *after* the read callback of the channel driver is called.
    We have to do this as the underlying channel driver may need the fdno value to determine what to read.
  ........
................

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

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

Modified: branches/1.6.1/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/channel.c?view=diff&rev=179674&r1=179673&r2=179674
==============================================================================
--- branches/1.6.1/main/channel.c (original)
+++ branches/1.6.1/main/channel.c Tue Mar  3 08:41:57 2009
@@ -2464,12 +2464,6 @@
 	}
 	prestate = chan->_state;
 
-	/* 
-	 * Reset the recorded file descriptor that triggered this read so that we can
-	 * easily detect when ast_read() is called without properly using ast_waitfor().
-	 */
-	chan->fdno = -1;
-
 	/* Read and ignore anything on the alertpipe, but read only
 	   one sizeof(blah) per frame that we send from it */
 	if (chan->alertpipe[0] > -1) {
@@ -2589,6 +2583,12 @@
 		else
 			ast_log(LOG_WARNING, "No read routine on channel %s\n", chan->name);
 	}
+
+        /*
+	 * Reset the recorded file descriptor that triggered this read so that we can
+	 * easily detect when ast_read() is called without properly using ast_waitfor().
+	 */
+	chan->fdno = -1;
 
 	if (f) {
 		/* if the channel driver returned more than one frame, stuff the excess