[asterisk-commits] mnicholson: branch irroot/t38gateway-trunk r324467 - in /team/irroot/t38gatew...

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed Jun 22 08:26:52 2011
New Revision: 324467

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=324467
Log:
removed redundant T.38 gateway option flag

Modified:
    team/irroot/t38gateway-trunk/include/asterisk/res_fax.h
    team/irroot/t38gateway-trunk/res/res_fax.c

Modified: team/irroot/t38gateway-trunk/include/asterisk/res_fax.h
URL: http://svnview.digium.com/svn/asterisk/team/irroot/t38gateway-trunk/include/asterisk/res_fax.h?view=diff&rev=324467&r1=324466&r2=324467
==============================================================================
--- team/irroot/t38gateway-trunk/include/asterisk/res_fax.h (original)
+++ team/irroot/t38gateway-trunk/include/asterisk/res_fax.h Wed Jun 22 08:26:52 2011
@@ -160,8 +160,6 @@
 			uint32_t send_cng:1;
 			/*! send a T.38 reinvite */
 			uint32_t request_t38:1;
-			/*! T.38 Gateway enable */
-			uint32_t t38gateway:1;
 		};
 	} option;
 	/*! override the minimum transmission rate with a channel variable */

Modified: team/irroot/t38gateway-trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/t38gateway-trunk/res/res_fax.c?view=diff&rev=324467&r1=324466&r2=324467
==============================================================================
--- team/irroot/t38gateway-trunk/res/res_fax.c (original)
+++ team/irroot/t38gateway-trunk/res/res_fax.c Wed Jun 22 08:26:52 2011
@@ -447,7 +447,6 @@
 	d->option.send_ced = AST_FAX_OPTFLAG_FALSE;
 	d->option.ecm = general_options.ecm;
 	d->option.statusevents = general_options.statusevents;
-	d->option.t38gateway = AST_FAX_OPTFLAG_FALSE;
 	d->modems = general_options.modems;
 	d->minrate = general_options.minrate;
 	d->maxrate = general_options.maxrate;
@@ -3184,7 +3183,7 @@
 		ast_copy_string(buf, details->option.ecm ? "yes" : "no", len);
 	} else if (!strcasecmp(data, "t38gateway") || !strcasecmp(data, "gateway") ||
 		   !strcasecmp(data, "t38_gateway") || !strcasecmp(data, "faxgateway")) {
-		ast_copy_string(buf, details->option.t38gateway ? "yes" : "no", len);
+		ast_copy_string(buf, details->gateway_id != -1 ? "yes" : "no", len);
 	} else if (!strcasecmp(data, "error")) {
 		ast_copy_string(buf, details->error, len);
 	} else if (!strcasecmp(data, "filename")) {
@@ -3270,7 +3269,6 @@
 					res = -1;
 				} else {
 					ast_debug(1, "Attached T.38 gateway to channel %s.\n", chan->name);
-					details->option.t38gateway = AST_FAX_OPTFLAG_TRUE;
 				}
 			} else {
 				ast_log(LOG_WARNING, "Attempt to attach a T.38 gateway on channel (%s) with gateway already running.\n", chan->name);
@@ -3278,7 +3276,6 @@
 		} else if (ast_false(val)) {
 			ast_framehook_detach(chan, details->gateway_id);
 			details->gateway_id = -1;
-			details->option.t38gateway = AST_FAX_OPTFLAG_FALSE;
 		} else {
 			ast_log(LOG_WARNING, "Unsupported value '%s' passed to FAXOPT(%s).\n", value, data);
 		}