Merged revisions 230381 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r230381 | kpfleming | 2009-11-16 10:40:25 -0600 (Mon, 16 Nov 2009) | 1 line

  Fix another buglet in T.38 session teardown at the end of FAX sessions.
........

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

diff --git a/apps/app_fax.c b/apps/app_fax.c
index 02be085fb6b69d530bb8ac20f6318add7df60cf4..c74113988aab94d563fd472beb951f5504d4edd8 100644 (file)
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -555,7 +555,6 @@ static int transmit_t38(fax_session *s)
        struct timeval now, start, state_change, last_frame;
        t30_state_t *t30state;
        t38_core_state_t *t38state;
-       struct ast_control_t38_parameters t38_parameters = { .request_response = AST_T38_REQUEST_TERMINATE, };
 
 #if SPANDSP_RELEASE_DATE >= 20080725
        /* for spandsp shaphots 0.0.6 and higher */
@@ -663,6 +662,8 @@ disable_t38:
         */
        if ((s->caller_mode == FALSE) &&
            (ast_channel_get_t38_state(s->chan) == T38_STATE_NEGOTIATED)) {
+               struct ast_control_t38_parameters t38_parameters = { .request_response = AST_T38_REQUEST_TERMINATE, };
+
                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;
@@ -694,7 +695,7 @@ disable_t38:
                                        struct ast_control_t38_parameters *parameters = inf->data;
                                        
                                        switch (parameters->request_response) {
-                                       case AST_T38_NEGOTIATED:
+                                       case AST_T38_TERMINATED:
                                                ast_debug(1, "Shut down T.38 on %s\n", s->chan->name);
                                                break;
                                        case AST_T38_REFUSED: