[asterisk-commits] irroot: branch irroot/distrotech-customers-10 r333941 - in /team/irroot/distr...

[SVN commits to the Asterisk project]

Author: irroot
Date: Tue Aug 30 10:49:56 2011
New Revision: 333941

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=333941
Log:
resolve conflict, enable automerge

Modified:
    team/irroot/distrotech-customers-10/   (props changed)
    team/irroot/distrotech-customers-10/res/res_fax.c

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 30 10:49:56 2011
@@ -1,1 +1,1 @@
-/branches/10:1-333849
+/branches/10:1-333940

Modified: team/irroot/distrotech-customers-10/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/res/res_fax.c?view=diff&rev=333941&r1=333940&r2=333941
==============================================================================
--- team/irroot/distrotech-customers-10/res/res_fax.c (original)
+++ team/irroot/distrotech-customers-10/res/res_fax.c Tue Aug 30 10:49:56 2011
@@ -190,7 +190,7 @@
 						<para>R/W Modem type (v17/v27/v29).</para>
 					</enum>
 					<enum name="gateway">
-						<para>R/W T38 Gateway Enabled (yes/no)</para>
+						<para>R/W T38 fax gateway, with optional fax activity timeout in seconds (yes[,timeout]/no)</para>
 					</enum>
 					<enum name="pages">
 						<para>R/O Number of pages transferred.</para>
@@ -475,7 +475,7 @@
 	d->minrate = general_options.minrate;
 	d->maxrate = general_options.maxrate;
 	d->gateway_id = -1;
-	d->gateway_timeout = FAX_GATEWAY_TIMEOUT;
+	d->gateway_timeout = 0;
 
 	return d;
 }
@@ -3760,16 +3760,16 @@
 	} else if (!strcasecmp(data, "t38gateway") || !strcasecmp(data, "gateway") ||
 		   !strcasecmp(data, "t38_gateway") || !strcasecmp(data, "faxgateway")) {
 		const char *val = ast_skip_blanks(value);
-		if (!ast_strlen_zero(val)) {
-			char *timeout = strchr(val, ',');
-			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);
-				}
+		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);
 			}
 		}