[asterisk-commits] russell: branch 1.6.0 r179743 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Mar  3 10:48:15 2009
New Revision: 179743

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

................
r179742 | russell | 2009-03-03 10:47:28 -0600 (Tue, 03 Mar 2009) | 14 lines

Merged revisions 179741 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r179741 | russell | 2009-03-03 10:45:46 -0600 (Tue, 03 Mar 2009) | 6 lines

Ensure chan->fdno always gets reset to -1 after handling a channel fd event.

Since setting fdno to -1 had to be moved, a couple of other code paths that
do process an fd event return early and do not pass through the code path
where it was moved to.  So, set it to -1 in a few other places, too.

........

................

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.digium.com/svn-view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=179743&r1=179742&r2=179743
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Tue Mar  3 10:48:15 2009
@@ -2515,12 +2515,14 @@
 				/* save a copy of func/data before unlocking the channel */
 				int (*func)(const void *) = chan->timingfunc;
 				void *data = chan->timingdata;
+				chan->fdno = -1;
 				ast_channel_unlock(chan);
 				func(data);
 			} else {
 				blah = 0;
 				ioctl(chan->timingfd, DAHDI_TIMERCONFIG, &blah);
 				chan->timingdata = NULL;
+				chan->fdno = -1;
 				ast_channel_unlock(chan);
 			}
 			/* cannot 'goto done' because the channel is already unlocked */
@@ -2538,6 +2540,7 @@
 		chan->generator->generate(chan, tmp, -1, -1);
 		chan->generatordata = tmp;
 		f = &ast_null_frame;
+		chan->fdno = -1;
 		goto done;
 	}
 
@@ -2595,7 +2598,7 @@
 			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().
 	 */