[asterisk-commits] rmudgett: branch rmudgett/stasis_linkedids r418155 - /team/rmudgett/stasis_li...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Jul  7 16:26:17 2014
New Revision: 418155

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418155
Log:
res_stasis: Always propagate linkedids in a stasis mixing bridge.

* Only propagate accountcodes if the stasis bridge is mixing and smart.
At this time the bridge is always smart when mixing.

Modified:
    team/rmudgett/stasis_linkedids/res/stasis/stasis_bridge.c

Modified: team/rmudgett/stasis_linkedids/res/stasis/stasis_bridge.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/stasis_linkedids/res/stasis/stasis_bridge.c?view=diff&rev=418155&r1=418154&r2=418155
==============================================================================
--- team/rmudgett/stasis_linkedids/res/stasis/stasis_bridge.c (original)
+++ team/rmudgett/stasis_linkedids/res/stasis/stasis_bridge.c Mon Jul  7 16:26:17 2014
@@ -53,10 +53,11 @@
  */
 static int bridge_stasis_push(struct ast_bridge *self, struct ast_bridge_channel *bridge_channel, struct ast_bridge_channel *swap)
 {
-	if ((self->allowed_capabilities & STASIS_BRIDGE_MIXING_CAPABILITIES)
-		&& ast_test_flag(&self->feature_flags, AST_BRIDGE_FLAG_SMART)) {
+	if (self->allowed_capabilities & STASIS_BRIDGE_MIXING_CAPABILITIES) {
 		ast_bridge_channel_update_linkedids(bridge_channel, swap);
-		ast_bridge_channel_update_accountcodes(bridge_channel, swap);
+		if (ast_test_flag(&self->feature_flags, AST_BRIDGE_FLAG_SMART)) {
+			ast_bridge_channel_update_accountcodes(bridge_channel, swap);
+		}
 	}
 
 	return ast_bridge_base_v_table.push(self, bridge_channel, swap);