[asterisk-commits] rmudgett: branch group/bridge_construction r388377 - in /team/group/bridge_co...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri May 10 15:29:34 2013
New Revision: 388377

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388377
Log:
Replace inlined versions of ast_channel_get_bridge_channel() with the call.

Modified:
    team/group/bridge_construction/main/bridging.c
    team/group/bridge_construction/res/parking/parking_bridge_features.c

Modified: team/group/bridge_construction/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bridge_construction/main/bridging.c?view=diff&rev=388377&r1=388376&r2=388377
==============================================================================
--- team/group/bridge_construction/main/bridging.c (original)
+++ team/group/bridge_construction/main/bridging.c Fri May 10 15:29:34 2013
@@ -2839,14 +2839,12 @@
 
 	/* Safely get the bridge_channel pointer for the chan. */
 	ast_channel_lock(chan);
-	bridge_channel = ast_channel_internal_bridge_channel(chan);
+	bridge_channel = ast_channel_get_bridge_channel(chan);
+	ast_channel_unlock(chan);
 	if (!bridge_channel) {
 		/* Not in a bridge */
-		ast_channel_unlock(chan);
 		return;
 	}
-	ao2_ref(bridge_channel, +1);
-	ast_channel_unlock(chan);
 
 	ast_bridge_channel_lock_bridge(bridge_channel);
 	bridge = bridge_channel->bridge;

Modified: team/group/bridge_construction/res/parking/parking_bridge_features.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bridge_construction/res/parking/parking_bridge_features.c?view=diff&rev=388377&r1=388376&r2=388377
==============================================================================
--- team/group/bridge_construction/res/parking/parking_bridge_features.c (original)
+++ team/group/bridge_construction/res/parking/parking_bridge_features.c Fri May 10 15:29:34 2013
@@ -101,16 +101,11 @@
 	}
 
 	ast_channel_lock(parker);
-
-	bridge_channel = ast_channel_internal_bridge_channel(parker);
+	bridge_channel = ast_channel_get_bridge_channel(parker);
+	ast_channel_unlock(parker);
 	if (!bridge_channel) {
-		ast_channel_unlock(parker);
-		return;
-	}
-
-	/* this reference will be freed by RAII_VAR */
-	ao2_ref(bridge_channel, +1);
-	ast_channel_unlock(parker);
+		return;
+	}
 
 	if (message->event_type == PARKED_CALL) {
 		/* queue the saynum on the bridge channel and hangup */