[svn-commits] trunk - r8120 in /trunk: ./ channels/

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 16 23:15:33 2006
New Revision: 8120

URL: http://svn.digium.com/view/asterisk?rev=8120&view=rev
Log:
don't generate any message for native bridge attempts unless all the basic checks have passed and we're actually going to try it

Modified:
    trunk/channel.c
    trunk/channels/chan_misdn.c
    trunk/channels/chan_vpb.c
    trunk/channels/chan_zap.c
    trunk/rtp.c

Modified: trunk/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/channel.c?rev=8120&r1=8119&r2=8120&view=diff
==============================================================================
--- trunk/channel.c (original)
+++ trunk/channel.c Mon Jan 16 23:15:33 2006
@@ -3460,8 +3460,6 @@
 		    !nativefailed && !c0->monitor && !c1->monitor &&
 		    !c0->spies && !c1->spies) {
 			/* Looks like they share a bridge method and nothing else is in the way */
-			if (option_verbose > 2) 
-				ast_verbose(VERBOSE_PREFIX_3 "Attempting native bridge of %s and %s\n", c0->name, c1->name);
 			ast_set_flag(c0, AST_FLAG_NBRIDGE);
 			ast_set_flag(c1, AST_FLAG_NBRIDGE);
 			if ((res = c0->tech->bridge(c0, c1, config->flags, fo, rc, to)) == AST_BRIDGE_COMPLETE) {
@@ -3493,7 +3491,9 @@
 			case AST_BRIDGE_RETRY:
 				continue;
 			default:
-				ast_log(LOG_WARNING, "Private bridge between %s and %s failed\n", c0->name, c1->name);
+				if (option_verbose > 2)
+					ast_verbose(VERBOSE_PREFIX_3, "Native bridging %s and %s ended\n",
+						    c0->name, c1->name);
 				/* fallthrough */
 			case AST_BRIDGE_FAILED_NOWARN:
 				nativefailed++;

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?rev=8120&r1=8119&r2=8120&view=diff
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Mon Jan 16 23:15:33 2006
@@ -2023,6 +2023,9 @@
 		misdn_lib_bridge(ch1->bc,ch2->bc);
 	}
 	
+	if (option_verbose > 2) 
+		ast_verbose(VERBOSE_PREFIX_3 "Native bridging %s and %s\n", c0->name, c1->name);
+
 	chan_misdn_log(1, ch1->bc->port, "* Makeing Native Bridge between %s and %s\n", ch1->bc->oad, ch2->bc->oad);
   
 	while(1) {

Modified: trunk/channels/chan_vpb.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_vpb.c?rev=8120&r1=8119&r2=8120&view=diff
==============================================================================
--- trunk/channels/chan_vpb.c (original)
+++ trunk/channels/chan_vpb.c Mon Jan 16 23:15:33 2006
@@ -475,6 +475,9 @@
 		if (option_verbose>1) 
 			ast_verbose(VERBOSE_PREFIX_2 "%s: vpb_bridge: Bridging call entered with [%s, %s]\n",p0->dev, c0->name, c1->name);
 	}
+
+	if (option_verbose > 2) 
+		ast_verbose(VERBOSE_PREFIX_3 "Native bridging %s and %s\n", c0->name, c1->name);
 
 	#ifdef HALF_DUPLEX_BRIDGE
 

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?rev=8120&r1=8119&r2=8120&view=diff
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Mon Jan 16 23:15:33 2006
@@ -3207,6 +3207,9 @@
 		return AST_BRIDGE_FAILED;
 	}
 	
+	if (option_verbose > 2) 
+		ast_verbose(VERBOSE_PREFIX_3 "Native bridging %s and %s\n", c0->name, c1->name);
+
 	if (!(flags & AST_BRIDGE_DTMF_CHANNEL_0) && (oi0 == SUB_REAL))
 		disable_dtmf_detect(op0);
 

Modified: trunk/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/rtp.c?rev=8120&r1=8119&r2=8120&view=diff
==============================================================================
--- trunk/rtp.c (original)
+++ trunk/rtp.c Mon Jan 16 23:15:33 2006
@@ -1655,6 +1655,9 @@
 		}
 	}
 
+	if (option_verbose > 2) 
+		ast_verbose(VERBOSE_PREFIX_3 "Native bridging %s and %s\n", c0->name, c1->name);
+
 	/* Ok, we should be able to redirect the media. Start with one channel */
 	if (pr0->set_rtp_peer(c0, p1, vp1, codec1, ast_test_flag(p1, FLAG_NAT_ACTIVE))) 
 		ast_log(LOG_WARNING, "Channel '%s' failed to talk to '%s'\n", c0->name, c1->name);