[asterisk-commits] murf: branch murf/AEL2-1.2 r48452 - in /team/murf/AEL2-1.2: ./ channel.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Wed Dec 13 09:20:26 2006
New Revision: 48452

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48452
Log:
return channel.c to normal

Modified:
    team/murf/AEL2-1.2/   (props changed)
    team/murf/AEL2-1.2/channel.c

Propchange: team/murf/AEL2-1.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 13 09:20:26 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-48412
+/branches/1.2:1-48451

Modified: team/murf/AEL2-1.2/channel.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2-1.2/channel.c?view=diff&rev=48452&r1=48451&r2=48452
==============================================================================
--- team/murf/AEL2-1.2/channel.c (original)
+++ team/murf/AEL2-1.2/channel.c Wed Dec 13 09:20:26 2006
@@ -3479,7 +3479,7 @@
 		if (callee_warning)
 			bridge_playfile(c1, c0, config->start_sound, time_left_ms / 1000);
 	}
-	
+
 	/* Keep track of bridge */
 	c0->_bridge = c1;
 	c1->_bridge = c0;
@@ -3503,14 +3503,6 @@
 		if (caller_warning || callee_warning)
 			nexteventts = ast_tvsub(nexteventts, ast_samp2tv(config->play_warning, 1000));
 	}
-	ast_log(LOG_NOTICE, "%s->%s timelimit=%d, time_left_ms=%d, start_time=%d, feature_timer=%d, play_warning=%d, nexteventts=%d, \n", 
-			c0->name, c1->name, 
-			(int)config->timelimit, 
-			(int)time_left_ms, 
-			(int)config->start_time.tv_sec, 
-			(int)config->feature_timer, 
-			(int)config->play_warning, 
-			(int)nexteventts.tv_sec);
 
 	for (/* ever */;;) {
 		struct timeval now = { 0, };
@@ -3523,7 +3515,6 @@
 			to = ast_tvdiff_ms(nexteventts, now);
 			if (to <= 0 && !config->timelimit) {	
 				res = AST_BRIDGE_COMPLETE;
-				ast_log(LOG_NOTICE, "ABout to break out of bridge -- timelimit reached\n");
 				break;
 			}	
 				
@@ -3543,7 +3534,6 @@
 				if (who) 
 					*rc = who;
 				res = 0;
-				ast_log(LOG_NOTICE, "ABout to break out of bridge -- time_left_ms reached\n");
 				break;
 			}
 			
@@ -3591,7 +3581,6 @@
 				ast_check_hangup(c0) ? "Yes" : "No",
 				ast_test_flag(c1, AST_FLAG_ZOMBIE) ? "Yes" : "No",
 				ast_check_hangup(c1) ? "Yes" : "No");
-			ast_log(LOG_NOTICE, "ABout to break out of bridge -- zombie\n");
 			break;
 		}
 
@@ -3626,7 +3615,6 @@
 				c0->_bridge = NULL;
 				c1->_bridge = NULL;
 
-				ast_log(LOG_NOTICE, "ABout to break out of bridge -- returning!!\n");
 				return res;
 			} else {
 				ast_clear_flag(c0, AST_FLAG_NBRIDGE);
@@ -3640,7 +3628,6 @@
 				/* fallthrough */
 			case AST_BRIDGE_FAILED_NOWARN:
 				nativefailed++;
-				ast_log(LOG_NOTICE, "ABout to break out of bridge -- failed, nowarn\n");
 				break;
 			}
 		}
@@ -3658,17 +3645,14 @@
 					      "CallerID1: %s\r\n"
 					      "CallerID2: %s\r\n",
 					      c0->name, c1->name, c0->uniqueid, c1->uniqueid, c0->cid.cid_num, c1->cid.cid_num);
-				ast_log(LOG_NOTICE, "ABout to Return after manager Unlink\n");
 				return AST_BRIDGE_FAILED;
 			}
 			o0nativeformats = c0->nativeformats;
 			o1nativeformats = c1->nativeformats;
 		}
-		res = ast_generic_bridge(c0, c1, config, fo, rc, nexteventts); /* this is where all the work is done */
-		if (res != AST_BRIDGE_RETRY && fo) {
-			ast_log(LOG_NOTICE, "ABout to break out of bridge -- RETRY (res=%d)\n", res);
+		res = ast_generic_bridge(c0, c1, config, fo, rc, nexteventts);
+		if (res != AST_BRIDGE_RETRY && fo)
 			break;
-		}
 	}
 
 	c0->_bridge = NULL;