[asterisk-commits] mmichelson: branch mmichelson/transfer r386438 - /team/mmichelson/transfer/apps/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Apr 24 14:23:19 2013
New Revision: 386438

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=386438
Log:
Set some transfer-related bridge flags when allocating bridges.


Modified:
    team/mmichelson/transfer/apps/app_bridgewait.c
    team/mmichelson/transfer/apps/app_confbridge.c

Modified: team/mmichelson/transfer/apps/app_bridgewait.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/transfer/apps/app_bridgewait.c?view=diff&rev=386438&r1=386437&r2=386438
==============================================================================
--- team/mmichelson/transfer/apps/app_bridgewait.c (original)
+++ team/mmichelson/transfer/apps/app_bridgewait.c Wed Apr 24 14:23:19 2013
@@ -196,7 +196,8 @@
 	ast_mutex_lock(&bridgewait_lock);
 	if (!holding_bridge) {
 		holding_bridge = ast_bridge_base_new(AST_BRIDGE_CAPABILITY_HOLDING,
-			AST_BRIDGE_FLAG_MERGE_INHIBIT_TO | AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM);
+			AST_BRIDGE_FLAG_MERGE_INHIBIT_TO | AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM |
+			AST_BRIDGE_FLAG_TRANSFER_PROHIBITED);
 	}
 	ast_mutex_unlock(&bridgewait_lock);
 	if (!holding_bridge) {

Modified: team/mmichelson/transfer/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/transfer/apps/app_confbridge.c?view=diff&rev=386438&r1=386437&r2=386438
==============================================================================
--- team/mmichelson/transfer/apps/app_confbridge.c (original)
+++ team/mmichelson/transfer/apps/app_confbridge.c Wed Apr 24 14:23:19 2013
@@ -1323,7 +1323,7 @@
 
 		/* Create an actual bridge that will do the audio mixing */
 		conference->bridge = ast_bridge_base_new(AST_BRIDGE_CAPABILITY_MULTIMIX,
-			AST_BRIDGE_FLAG_MASQUERADE_ONLY);
+			AST_BRIDGE_FLAG_MASQUERADE_ONLY | AST_BRIDGE_FLAG_TRANSFER_BRIDGE_ONLY);
 		if (!conference->bridge) {
 			ao2_ref(conference, -1);
 			conference = NULL;