sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged revisions 377658 via svnmerge from 

file:///srv/subversion/repos/asterisk/trunk

................
  r377658 | kmoore | 2012-12-10 10:56:37 -0600 (Mon, 10 Dec 2012) | 20 lines
  
  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
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script 2012-12-10 17:19:37 +00:00
parent 957cb0742b
commit 66c60e5523
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/res_fax.c
View File

@ -1871,6 +1871,7 @@ static int receivefax_exec(struct ast_channel *chan, const char *data)
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 @@ static int receivefax_exec(struct ast_channel *chan, const char *data)
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) {