[asterisk-commits] kmoore: trunk r396722 - /trunk/res/res_stasis.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Thu Aug 15 07:05:41 2013
New Revision: 396722

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=396722
Log:
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

Modified:
    trunk/res/res_stasis.c

Modified: trunk/res/res_stasis.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_stasis.c?view=diff&rev=396722&r1=396721&r2=396722
==============================================================================
--- trunk/res/res_stasis.c (original)
+++ trunk/res/res_stasis.c Thu Aug 15 07:05:41 2013
@@ -442,12 +442,15 @@
 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 {