[asterisk-commits] kpfleming: branch 1.6.0 r230344 - in /branches/1.6.0: ./ apps/app_fax.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Mon Nov 16 06:52:48 2009
New Revision: 230344

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=230344
Log:
Merged revisions 230343 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r230343 | kpfleming | 2009-11-16 06:51:59 -0600 (Mon, 16 Nov 2009) | 2 lines
  
  Ensure that only one end of a T.38 session initiates teardown at completion.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_fax.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_fax.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_fax.c?view=diff&rev=230344&r1=230343&r2=230344
==============================================================================
--- branches/1.6.0/apps/app_fax.c (original)
+++ branches/1.6.0/apps/app_fax.c Mon Nov 16 06:52:48 2009
@@ -658,7 +658,11 @@
 	t38_terminal_release(&t38);
 
 disable_t38:
-	if (ast_channel_get_t38_state(s->chan) == T38_STATE_NEGOTIATED) {
+	/* if we are not the caller, it's our job to shut down the T.38
+	 * session when the FAX transmisson is complete.
+	 */
+	if ((s->caller_mode == FALSE) &&
+	    (ast_channel_get_t38_state(s->chan) == T38_STATE_NEGOTIATED)) {
 		if (ast_indicate_data(s->chan, AST_CONTROL_T38_PARAMETERS, &t38_parameters, sizeof(t38_parameters)) == 0) {
 			/* wait up to five seconds for negotiation to complete */
 			unsigned int timeout = 5000;