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

diff --git a/apps/app_fax.c b/apps/app_fax.c
index 6999da1b31b8062727187647299fdb0549caa2c9..7e1e55810dc744050aec3b50d1efd50e1d5d75c1 100644 (file)
--- 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);
                        }