From 6c92eb90d045de616e4f38f8e2bebfd3205bbce7 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Mon, 27 Jul 2009 21:44:26 +0000 Subject: [PATCH] Merged revisions 209279 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r209279 | kpfleming | 2009-07-27 16:43:36 -0500 (Mon, 27 Jul 2009) | 7 lines Cleanup T.38 negotiation changes. Convert LOG_NOTICE messages about T.38 negotiation in debug level 1 messages, clean up some looping logic, and correct an improper use of ast_free() for freeing an ast_frame. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@209281 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_fax.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/app_fax.c b/apps/app_fax.c index 6999da1b31..7e1e55810d 100644 --- a/apps/app_fax.c +++ b/apps/app_fax.c @@ -349,7 +349,7 @@ static int transmit_audio(fax_session *s) unsigned int timeout = 5000; int ms; - ast_log(LOG_NOTICE, "Negotiating T.38 for receive on %s\n", s->chan->name); + ast_debug(1, "Negotiating T.38 for receive on %s\n", s->chan->name); while (timeout > 0) { ms = ast_waitfor(s->chan, 1000); if (ms < 0) { @@ -376,9 +376,9 @@ static int transmit_audio(fax_session *s) switch (parameters->request_response) { case AST_T38_NEGOTIATED: - ast_log(LOG_NOTICE, "Negotiated T.38 for receive on %s\n", s->chan->name); - ast_free(inf); - return 1; + ast_debug(1, "Negotiated T.38 for receive on %s\n", s->chan->name); + res = 1; + break; case AST_T38_REFUSED: ast_log(LOG_WARNING, "channel '%s' refused to negotiate T.38\n", s->chan->name); break; @@ -387,7 +387,11 @@ static int transmit_audio(fax_session *s) break; } ast_frfree(inf); - break; + if (res == 1) { + return 1; + } else { + break; + } } ast_frfree(inf); }