[svn-commits] mmichelson: branch mmichelson/transfer r388044 - /team/mmichelson/transfer/main/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed May  8 15:19:33 2013
New Revision: 388044

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388044
Log:
Address review feedback.


Modified:
    team/mmichelson/transfer/main/bridging.c

Modified: team/mmichelson/transfer/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/transfer/main/bridging.c?view=diff&rev=388044&r1=388043&r2=388044
==============================================================================
--- team/mmichelson/transfer/main/bridging.c (original)
+++ team/mmichelson/transfer/main/bridging.c Wed May  8 15:19:33 2013
@@ -4882,7 +4882,7 @@
 	ast_copy_string(blind_data.exten, exten, sizeof(blind_data.exten));
 	ast_copy_string(blind_data.context, context, sizeof(blind_data.context));
 
-	/* XXX Why doesn't this function return success/failure? */
+/* BUGBUG Why doesn't this function return success/failure? */
 	ast_bridge_channel_queue_action_data(transferee_bridge_channel,
 			AST_BRIDGE_ACTION_BLIND_TRANSFER, &blind_data, sizeof(blind_data));
 
@@ -4895,9 +4895,10 @@
 	PARKING_NOT_APPLICABLE,
 };
 
-static enum try_parking_result try_parking(struct ast_bridge *bridge, struct ast_channel *transferer)
-{
-	/* XXX The following is all commented out because the functionality is not
+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
@@ -4946,7 +4947,7 @@
 
 	ast_channel_lock(transferer);
 	transferer_name = ast_strdupa(ast_channel_name(transferer));
-	transferer_bridgepeer = ast_strdupa(pbx_builtin_getvar_helper(transferer, "BRIDGEPEER"));
+	transferer_bridgepeer = ast_strdupa(S_OR(pbx_builtin_getvar_helper(transferer, "BRIDGEPEER"), ""));
 	ast_channel_unlock(transferer);
 
 	for (iter = ao2_iterator_init(channels, 0);
@@ -4981,7 +4982,7 @@
 		return AST_BRIDGE_TRANSFER_INVALID;
 	}
 
-	parking_result = try_parking(bridge, transferer);
+	parking_result = try_parking(bridge, transferer, exten, context);
 	switch (parking_result) {
 	case PARKING_SUCCESS:
 		return AST_BRIDGE_TRANSFER_SUCCESS;