[asterisk-commits] mnicholson: branch group/res_fax r243384 - /team/group/res_fax/res/res_fax.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Tue Jan 26 16:13:55 2010
New Revision: 243384

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=243384
Log:
Don't ignore the return value of ast_waitfor when sending CED tone and make sure ms is always initilized before use.

Modified:
    team/group/res_fax/res/res_fax.c

Modified: team/group/res_fax/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/group/res_fax/res/res_fax.c?view=diff&rev=243384&r1=243383&r2=243384
==============================================================================
--- team/group/res_fax/res/res_fax.c (original)
+++ team/group/res_fax/res/res_fax.c Tue Jan 26 16:13:55 2010
@@ -667,7 +667,7 @@
 		}
 
 		do {
-			ast_waitfor(chan, ms);
+			ms = ast_waitfor(chan, ms);
 			if (ms < 0) {
 				ast_log(LOG_ERROR, "error while generating CED tone on %s\n", chan->name);
 				ast_tonepair_stop(chan);
@@ -940,6 +940,7 @@
 	ast_debug(5, "channel %s will wait on FAX fd %d\n", chan->name, fax->fd);
 
 	/* handle frames for the session */
+	ms = 1000;
 	while ((ms > -1) && (timeout > 0)) {
 		struct ast_channel *ready_chan;
 		int ofd, exception;