[asterisk-commits] kpfleming: trunk r230343 - /trunk/apps/app_fax.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Mon Nov 16 06:51:59 2009
New Revision: 230343

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=230343
Log:
Ensure that only one end of a T.38 session initiates teardown at completion.

Modified:
    trunk/apps/app_fax.c

Modified: trunk/apps/app_fax.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_fax.c?view=diff&rev=230343&r1=230342&r2=230343
==============================================================================
--- trunk/apps/app_fax.c (original)
+++ trunk/apps/app_fax.c Mon Nov 16 06:51:59 2009
@@ -706,7 +706,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;