[svn-commits] kpfleming: branch 1.6.1 r209281 - in /branches/1.6.1: ./ apps/app_fax.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Mon Jul 27 16:44:26 2009
New Revision: 209281

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=209281
Log:
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.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_fax.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_fax.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/apps/app_fax.c?view=diff&rev=209281&r1=209280&r2=209281
==============================================================================
--- branches/1.6.1/apps/app_fax.c (original)
+++ branches/1.6.1/apps/app_fax.c Mon Jul 27 16:44:26 2009
@@ -349,7 +349,7 @@
 			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 @@
 					
 					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 @@
 						break;
 					}
 					ast_frfree(inf);
-					break;
+					if (res == 1) {
+						return 1;
+					} else {
+						break;
+					}
 				}
 				ast_frfree(inf);
 			}