[asterisk-commits] russell: branch 1.6.0 r129007 - in /branches/1.6.0: ./ apps/app_fax.c

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Jul  8 09:18:05 2008
New Revision: 129007

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

........
r129006 | russell | 2008-07-08 09:17:37 -0500 (Tue, 08 Jul 2008) | 9 lines

Update app_fax for better compatibility with spandsp 0.0.5.  Add a call to
t38_terminal_release, and make sure that the phase E handler gets called
with proper status.

(closes issue #13020)
Reported by: dimas
Patches:
      v1-appfax.patch uploaded by dimas (license 88)

........

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://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_fax.c?view=diff&rev=129007&r1=129006&r2=129007
==============================================================================
--- branches/1.6.0/apps/app_fax.c (original)
+++ branches/1.6.0/apps/app_fax.c Tue Jul  8 09:18:05 2008
@@ -448,9 +448,12 @@
 
 	ast_deactivate_generator(s->chan);
 
-	/* Remove phase E handler because we do not want it to be executed
-	   only because we called t30_terminate */
-	t30_set_phase_e_handler(&fax.t30_state, NULL, NULL);
+	/* If we are switching to T38, remove phase E handler. Otherwise it will be executed
+	   by t30_terminate, display diagnostics and set status variables although no transmittion
+	   has taken place yet. */
+	if (res > 0) {
+		t30_set_phase_e_handler(&fax.t30_state, NULL, NULL);
+	}
 
 	t30_terminate(&fax.t30_state);
 	fax_release(&fax);
@@ -557,11 +560,8 @@
 	if (inf)
 		ast_frfree(inf);
 
-	/* Remove phase E handler because we do not want it to be executed
-	   only because we called t30_terminate */
-	t30_set_phase_e_handler(&t38.t30_state, NULL, NULL);
-
 	t30_terminate(&t38.t30_state);
+	t38_terminal_release(&t38);
 
 	return res;
 }