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)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@129006 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_fax.c b/apps/app_fax.c
index cf98cc9..675d626 100644 (file)
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -448,9 +448,12 @@ static int transmit_audio(fax_session *s)
 
        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 @@ static int transmit_t38(fax_session *s)
        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;
 }