[asterisk-commits] mnicholson: trunk r333736 - in /trunk: ./ res/res_fax_spandsp.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Mon Aug 29 13:28:02 2011
New Revision: 333736

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=333736
Log:
Merged revisions 333716 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r333716 | mnicholson | 2011-08-29 13:22:58 -0500 (Mon, 29 Aug 2011) | 5 lines
  
  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:
    trunk/   (props changed)
    trunk/res/res_fax_spandsp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/res/res_fax_spandsp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_fax_spandsp.c?view=diff&rev=333736&r1=333735&r2=333736
==============================================================================
--- trunk/res/res_fax_spandsp.c (original)
+++ trunk/res/res_fax_spandsp.c Mon Aug 29 13:28:02 2011
@@ -683,6 +683,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);