[asterisk-commits] mnicholson: trunk r280559 - in /trunk: ./ res/res_fax.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Thu Jul 29 16:08:42 2010
New Revision: 280559

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280559
Log:
Merged revisions 280557 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r280557 | mnicholson | 2010-07-29 16:07:21 -0500 (Thu, 29 Jul 2010) | 4 lines
  
  Fix regression introduced in r1664.  Give the fax stack time to shutdown and populate the FAXOPT output variables.
  
  FAX-222
........

Modified:
    trunk/   (props changed)
    trunk/res/res_fax.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_fax.c?view=diff&rev=280559&r1=280558&r2=280559
==============================================================================
--- trunk/res/res_fax.c (original)
+++ trunk/res/res_fax.c Thu Jul 29 16:08:42 2010
@@ -811,12 +811,17 @@
 	pbx_builtin_setvar_helper(chan, "FAXPAGES", buf);
 }
 
-#define GENERIC_FAX_EXEC_ERROR_QUIET(fax, chan, errorstr, reason) \
+#define GENERIC_FAX_EXEC_SET_VARS(fax, chan, errorstr, reason) \
 	do {	\
 		ast_string_field_set(fax->details, result, S_OR(fax->details->result, "FAILED")); \
 		ast_string_field_set(fax->details, resultstr, S_OR(fax->details->resultstr, reason)); \
 		ast_string_field_set(fax->details, error, S_OR(fax->details->error, errorstr)); \
 		set_channel_variables(chan, fax->details); \
+	} while (0)
+
+#define GENERIC_FAX_EXEC_ERROR_QUIET(fax, chan, errorstr, reason) \
+	do {	\
+		GENERIC_FAX_EXEC_SET_VARS(fax, chan, errorstr, reason); \
 		res = ms = -1; \
 	} while (0)
 
@@ -1053,7 +1058,7 @@
  				 * send the FAX stack silence so the modems can finish their session without
  				 * any problems */
 				ast_log(LOG_NOTICE, "Channel '%s' did not return a frame; probably hung up.\n", chan->name);
-				GENERIC_FAX_EXEC_ERROR_QUIET(fax, chan, "HANGUP", "remote end hungup");
+				GENERIC_FAX_EXEC_SET_VARS(fax, chan, "HANGUP", "remote channel hungup");
 				c = NULL;
 				chancount = 0;
 				timeout -= (1000 - ms);