kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 18:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 209279 via svnmerge from

Browse Source 
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.0@209280 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2009-07-27 21:44:08 +00:00
parent dcefa607e5
commit d7f3974c8d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/app_fax.c
View File

@@ -349,7 +349,7 @@ static int transmit_audio(fax_session *s)
unsigned int timeout = 5000; unsigned int timeout = 5000;
int ms; 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) { while (timeout > 0) {
ms = ast_waitfor(s->chan, 1000); ms = ast_waitfor(s->chan, 1000);
if (ms < 0) { if (ms < 0) {
@@ -376,9 +376,9 @@ static int transmit_audio(fax_session *s)
switch (parameters->request_response) { switch (parameters->request_response) {
case AST_T38_NEGOTIATED: case AST_T38_NEGOTIATED:
ast_log(LOG_NOTICE, "Negotiated T.38 for receive on %s\n", s->chan->name); ast_debug(1, "Negotiated T.38 for receive on %s\n", s->chan->name);
ast_free(inf); res = 1;
return 1; break;
case AST_T38_REFUSED: case AST_T38_REFUSED:
ast_log(LOG_WARNING, "channel '%s' refused to negotiate T.38\n", s->chan->name); ast_log(LOG_WARNING, "channel '%s' refused to negotiate T.38\n", s->chan->name);
break; break;
@@ -387,7 +387,11 @@ static int transmit_audio(fax_session *s)
break; break;
} }
ast_frfree(inf); ast_frfree(inf);
break; if (res == 1) {
return 1;
} else {
break;
}
} }
ast_frfree(inf); ast_frfree(inf);
} }