[asterisk-commits] mnicholson: branch irroot/t38gateway-trunk r324620 - /team/irroot/t38gateway-...

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Thu Jun 23 10:21:06 2011
New Revision: 324620

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=324620
Log:
tweaked return values for CED detection failure cases and fixed another
gateway->framehook instead of details->gateway_id case

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

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=324620&r1=324619&r2=324620
==============================================================================
--- team/irroot/t38gateway-trunk/res/res_fax.c (original)
+++ team/irroot/t38gateway-trunk/res/res_fax.c Thu Jun 23 10:21:06 2011
@@ -2450,24 +2450,23 @@
 
 			if (!details) {
 				ast_log(LOG_ERROR, "no FAX session details found on chan %s for T.38 gateway session, odd\n", chan->name);
-				ast_framehook_detach(chan, details->gateway_id);
-				details->gateway_id = -1;
-				return &ast_null_frame;
+				ast_framehook_detach(chan, gateway->framehook);
+				return f;
 			}
 
 			t38_parameters_fax_to_ast(&t38_parameters, &details->our_t38_parameters);
 			ao2_ref(details, -1);
 
-			if (!(f = ast_frisolate(&control_frame))) {
+			if (!(dfr = ast_frisolate(&control_frame))) {
 				ast_log(LOG_ERROR, "error generating T.38 request control frame on chan %s for T.38 gateway session\n", chan->name);
-				return &ast_null_frame;
+				return f;
 			}
 
 			gateway->t38_state = T38_STATE_NEGOTIATING;
 			gateway->bridge_start = ast_tvnow();
 
 			ast_debug(1, "detected CED tone on %s, requesting T.38 on %s for T.38 gateway session\n", active->name, other->name);
-			return f;
+			return dfr;
 		} else {
 			ast_debug(1, "detected CED tone on %s, but %s does not support T.38 for T.38 gateway session\n", active->name, other->name);
 		}