kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 16:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 334064 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r334064 | mnicholson | 2011-08-31 11:31:00 -0500 (Wed, 31 Aug 2011) | 4 lines
  
  only alter the gateway_timeout when attching the gateway to a channel
  
  ASTERISK-18219
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334067 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2011-08-31 16:31:30 +00:00
parent 1961bb6160
commit dadc749dac
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/res_fax.c
View File

@@ -3548,19 +3548,22 @@ static int acf_faxopt_write(struct ast_channel *chan, const char *cmd, char *dat
const char *val = ast_skip_blanks(value);
char *timeout = strchr(val, ',');
details->gateway_timeout = 0;
if (timeout) {
unsigned int gwtimeout;
*timeout++ = '\0';
if (sscanf(timeout, "%u", &gwtimeout) == 1) {
details->gateway_timeout = gwtimeout * 1000;
} else {
ast_log(LOG_WARNING, "Unsupported timeout '%s' passed to FAXOPT(%s).\n", timeout, data);
}
}
if (ast_true(val)) {
if (details->gateway_id < 0) {
details->gateway_timeout = 0;
if (timeout) {
unsigned int gwtimeout;
if (sscanf(timeout, "%u", &gwtimeout) == 1) {
details->gateway_timeout = gwtimeout * 1000;
} else {
ast_log(LOG_WARNING, "Unsupported timeout '%s' passed to FAXOPT(%s).\n", timeout, data);
}
}
details->gateway_id = fax_gateway_attach(chan, details);
if (details->gateway_id < 0) {
ast_log(LOG_ERROR, "Error attaching T.38 gateway to channel %s.\n", chan->name);