[asterisk-commits] russell: trunk r179742 - in /trunk: ./ main/channel.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Mar 3 10:47:32 CST 2009


Author: russell
Date: Tue Mar  3 10:47:28 2009
New Revision: 179742

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=179742
Log:
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:
    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=179742&r1=179741&r2=179742
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue Mar  3 10:47:28 2009
@@ -2524,10 +2524,12 @@
 				/* 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 {
 				ast_timer_set_rate(chan->timingfd, 0);
+				chan->fdno = -1;
 				ast_channel_unlock(chan);
 			}
 
@@ -2551,6 +2553,7 @@
 		chan->generator->generate(chan, tmp, -1, -1);
 		chan->generatordata = tmp;
 		f = &ast_null_frame;
+		chan->fdno = -1;
 		goto done;
 	}
 
@@ -2609,7 +2612,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().
 	 */




More information about the asterisk-commits mailing list