mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	Prevent automagic things from happening to Stasis application bridges
This prevents swap optimization, merges, and transfers involving Stasis application bridges. It wouldn't be nice if the bridge you thought you owned disappeared from under you. Reported-by: Richard Mudgett git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -442,12 +442,15 @@ static void control_unlink(struct stasis_app_control *control) | ||||
| struct ast_bridge *stasis_app_bridge_create(const char *type) | ||||
| { | ||||
| 	struct ast_bridge *bridge; | ||||
| 	int capabilities, flags = 0; | ||||
| 	int capabilities, flags = AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM | AST_BRIDGE_FLAG_MERGE_INHIBIT_TO | ||||
| 		| AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM | AST_BRIDGE_FLAG_SWAP_INHIBIT_TO | ||||
| 		| AST_BRIDGE_FLAG_TRANSFER_PROHIBITED; | ||||
|  | ||||
| 	if (ast_strlen_zero(type) || !strcmp(type, "mixing")) { | ||||
| 		capabilities = AST_BRIDGE_CAPABILITY_1TO1MIX | | ||||
| 			AST_BRIDGE_CAPABILITY_MULTIMIX | | ||||
| 			AST_BRIDGE_CAPABILITY_NATIVE; | ||||
| 		flags = AST_BRIDGE_FLAG_SMART; | ||||
| 		flags |= AST_BRIDGE_FLAG_SMART; | ||||
| 	} else if (!strcmp(type, "holding")) { | ||||
| 		capabilities = AST_BRIDGE_CAPABILITY_HOLDING; | ||||
| 	} else { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user