[asterisk-commits] kpfleming: branch 1.6.1 r230383 - in /branches/1.6.1: ./ apps/app_fax.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Mon Nov 16 10:41:27 2009
New Revision: 230383

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=230383
Log:
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.
........

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

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

Modified: branches/1.6.1/apps/app_fax.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_fax.c?view=diff&rev=230383&r1=230382&r2=230383
==============================================================================
--- branches/1.6.1/apps/app_fax.c (original)
+++ branches/1.6.1/apps/app_fax.c Mon Nov 16 10:41:27 2009
@@ -555,7 +555,6 @@
 	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 @@
 	 */
 	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 @@
 					struct ast_control_t38_parameters *parameters = inf->data.ptr;
 					
 					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: