[svn-commits] mnicholson: branch irroot/t38gateway-1.8 r333737 - /team/irroot/t38gateway-1....

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Mon Aug 29 13:28:24 2011
New Revision: 333737

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=333737
Log:
It is possible for the gateway to be attached when the channel is still
negotiating T.38. This change handles that case.
  
ASTERISK-18329

Modified:
    team/irroot/t38gateway-1.8/res/res_fax_spandsp.c

Modified: team/irroot/t38gateway-1.8/res/res_fax_spandsp.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/t38gateway-1.8/res/res_fax_spandsp.c?view=diff&rev=333737&r1=333736&r2=333737
==============================================================================
--- team/irroot/t38gateway-1.8/res/res_fax_spandsp.c (original)
+++ team/irroot/t38gateway-1.8/res/res_fax_spandsp.c Mon Aug 29 13:28:24 2011
@@ -684,6 +684,13 @@
 		ast_channel_unlock(s->chan);
 		return -1;
 	}
+
+	/* we can be in T38_STATE_NEGOTIATING or T38_STATE_NEGOTIATED when the
+	 * gateway is started. We treat both states the same. */
+	if (p->ast_t38_state == T38_STATE_NEGOTIATING) {
+		p->ast_t38_state = T38_STATE_NEGOTIATED;
+	}
+
 	ast_activate_generator(p->ast_t38_state == T38_STATE_NEGOTIATED ? peer : s->chan, &t30_gen , s);
 
 	set_logging(&p->t38_gw_state.logging, s->details);