[asterisk-commits] jrose: trunk r390669 - /trunk/main/bridging.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Thu Jun  6 13:21:18 2013
New Revision: 390669

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=390669
Log:
Parking: Enable code responsible for intercepting park exten transfers


Modified:
    trunk/main/bridging.c

Modified: trunk/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridging.c?view=diff&rev=390669&r1=390668&r2=390669
==============================================================================
--- trunk/main/bridging.c (original)
+++ trunk/main/bridging.c Thu Jun  6 13:21:18 2013
@@ -5386,30 +5386,22 @@
 static enum try_parking_result try_parking(struct ast_bridge *bridge, struct ast_channel *transferer,
 		const char *exten, const char *context)
 {
-	/* BUGBUG The following is all commented out because the functionality is not
-	 * present yet. The functions referenced here are available at team/jrose/bridge_projects.
-	 * Once the code there has been merged into team/group/bridge_construction,
-	 * this can be uncommented and tested
-	 */
-
-#if 0
 	RAII_VAR(struct ast_bridge_channel *, transferer_bridge_channel, NULL, ao2_cleanup);
 	struct ast_exten *parking_exten;
 
 	ast_channel_lock(transferer);
-	transfer_bridge_channel = ast_channel_get_bridge_channel(transferer);
+	transferer_bridge_channel = ast_channel_get_bridge_channel(transferer);
 	ast_channel_unlock(transferer);
 
-	if (!transfer_bridge_channel) {
+	if (!transferer_bridge_channel) {
 		return PARKING_FAILURE;
 	}
 
 	parking_exten = ast_get_parking_exten(exten, NULL, context);
 	if (parking_exten) {
-		return ast_park_blind_xfer(bridge, transferer, parking_exten) == 0 ?
+		return ast_park_blind_xfer(bridge, transferer_bridge_channel, parking_exten) == 0 ?
 			PARKING_SUCCESS : PARKING_FAILURE;
 	}
-#endif
 
 	return PARKING_NOT_APPLICABLE;
 }