[asterisk-commits] kpfleming: trunk r209279 - /trunk/apps/app_fax.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Mon Jul 27 16:43:36 2009
New Revision: 209279

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=209279
Log:
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:
    trunk/apps/app_fax.c

Modified: trunk/apps/app_fax.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/apps/app_fax.c?view=diff&rev=209279&r1=209278&r2=209279
==============================================================================
--- trunk/apps/app_fax.c (original)
+++ trunk/apps/app_fax.c Mon Jul 27 16:43:36 2009
@@ -394,7 +394,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) {
@@ -421,9 +421,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;
@@ -432,7 +432,11 @@
 						break;
 					}
 					ast_frfree(inf);
-					break;
+					if (res == 1) {
+						return 1;
+					} else {
+						break;
+					}
 				}
 				ast_frfree(inf);
 			}