diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-27 21:44:08 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-27 21:44:08 +0000 |
| commit | e6512f1bb1a96da7cf1b2de12edc56ce04bd9873 (patch) | |
| tree | d0ae8c8dbd89332e329d8760b5b572dc6255adba /apps | |
| parent | 5c49a17b5db7e2307c65f6551442bb13c55d0b48 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@209280 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_fax.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/apps/app_fax.c b/apps/app_fax.c index c6f372515..4cda9ce4b 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); } |