[svn-commits] kmoore: trunk r377658 - in /trunk: ./ res/res_fax.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Mon Dec 10 10:56:37 2012
New Revision: 377658

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=377658
Log:
Ensure ReceiveFax provides a CED tone via T.38

When using res_fax_digium, the T.38 CED tone was not being provided
properly which would cause some incoming faxes to fail. This was not an
issue with res_fax_spandsp since it does not strictly honor the
send_ced flag and sends the CED tone whenever receiving a T.38 fax.

(closes issue FAX-343)
Reported-by: Benjamin Tietz
Patch-by: Kinsey Moore
........

Merged revisions 377655 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 377656 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 377657 from http://svn.asterisk.org/svn/asterisk/branches/11

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-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=377658&r1=377657&r2=377658
==============================================================================
--- trunk/res/res_fax.c (original)
+++ trunk/res/res_fax.c Mon Dec 10 10:56:37 2012
@@ -1871,6 +1871,7 @@
 	ast_verb(3, "Channel '%s' receiving FAX '%s'\n", ast_channel_name(chan), args.filename);
 
 	details->caps = AST_FAX_TECH_RECEIVE;
+	details->option.send_ced = AST_FAX_OPTFLAG_TRUE;
 
 	/* check for debug */
 	if (ast_test_flag(&opts, OPT_DEBUG) || global_fax_debug) {
@@ -1935,8 +1936,6 @@
 			ast_log(LOG_ERROR, "error initializing channel '%s' in T.38 mode\n", ast_channel_name(chan));
 			return -1;
 		}
-	} else {
-		details->option.send_ced = 1;
 	}
 
 	if ((channel_alive = generic_fax_exec(chan, details, s, token)) < 0) {