From 350545bd8fdab307b11a9f2a682ea85ec92c7c14 Mon Sep 17 00:00:00 2001
From: Matthew Nicholson <mnicholson@digium.com>
Date: Wed, 24 Aug 2011 16:52:56 +0000
Subject: [PATCH] Merged revisions 333115 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
........
r333115 | mnicholson | 2011-08-24 11:51:42 -0500 (Wed, 24 Aug 2011) | 4 lines
Changed the "timeout" option to "gwtimeout".
ASTERISK-18219
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@333117 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
res/res_fax.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/res/res_fax.c b/res/res_fax.c
index fe0b6f904d..b43a29364c 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -192,7 +192,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<enum name="gateway">
<para>R/W T38 Gateway Enabled (yes/no)</para>
</enum>
- <enum name="timeout">
+ <enum name="gwtimeout">
<para>R/W Gateway fax activity timeout in seconds (yes/no/seconds)</para>
</enum>
<enum name="pages">
@@ -3472,7 +3472,7 @@ static int acf_faxopt_read(struct ast_channel *chan, const char *cmd, char *data
} else if (!strcasecmp(data, "t38gateway") || !strcasecmp(data, "gateway") ||
!strcasecmp(data, "t38_gateway") || !strcasecmp(data, "faxgateway")) {
ast_copy_string(buf, details->gateway_id != -1 ? "yes" : "no", len);
- } else if (!strcasecmp(data, "timeout")) {
+ } else if (!strcasecmp(data, "gwtimeout")) {
snprintf(buf, len, "%d", details->gateway_timeout / 1000);
} else if (!strcasecmp(data, "error")) {
ast_copy_string(buf, details->error, len);
@@ -3569,7 +3569,7 @@ static int acf_faxopt_write(struct ast_channel *chan, const char *cmd, char *dat
} else {
ast_log(LOG_WARNING, "Unsupported value '%s' passed to FAXOPT(%s).\n", value, data);
}
- } else if (!strcasecmp(data, "timeout")) {
+ } else if (!strcasecmp(data, "gwtimeout")) {
const char *val = ast_skip_blanks(value);
int timeout;
if (ast_true(val)) {
--
GitLab