From 8d0527f467ec79cd96d340134df54a562452f496 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Mon, 16 Nov 2009 12:52:48 +0000 Subject: [PATCH] Merged revisions 230343 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r230343 | kpfleming | 2009-11-16 06:51:59 -0600 (Mon, 16 Nov 2009) | 2 lines Ensure that only one end of a T.38 session initiates teardown at completion. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@230344 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_fax.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/app_fax.c b/apps/app_fax.c index 70a1bdd3a9..02be085fb6 100644 --- a/apps/app_fax.c +++ b/apps/app_fax.c @@ -658,7 +658,11 @@ static int transmit_t38(fax_session *s) 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;