[asterisk-commits] kmoore: branch kmoore/bridge_construction-cel_channels r390431 - /team/kmoore...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Jun  4 14:42:00 2013
New Revision: 390431

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=390431
Log:
Address David's comments

Modified:
    team/kmoore/bridge_construction-cel_channels/main/cel.c

Modified: team/kmoore/bridge_construction-cel_channels/main/cel.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/bridge_construction-cel_channels/main/cel.c?view=diff&rev=390431&r1=390430&r2=390431
==============================================================================
--- team/kmoore/bridge_construction-cel_channels/main/cel.c (original)
+++ team/kmoore/bridge_construction-cel_channels/main/cel.c Tue Jun  4 14:42:00 2013
@@ -1172,7 +1172,6 @@
 		for (i = 0; i < ARRAY_LEN(cel_channel_monitors); ++i) {
 			cel_channel_monitors[i](old_snapshot, new_snapshot);
 		}
-	} else if (update->type == ast_bridge_snapshot_type()) {
 	}
 }
 
@@ -1185,7 +1184,7 @@
 	struct ast_bridge_snapshot *snapshot = blob->bridge;
 	struct ast_channel_snapshot *chan_snapshot = blob->channel;
 
-	if (snapshot->capabilities | AST_BRIDGE_CAPABILITY_1TO1MIX || snapshot->capabilities | AST_BRIDGE_CAPABILITY_NATIVE) {
+	if (snapshot->capabilities & (AST_BRIDGE_CAPABILITY_1TO1MIX | AST_BRIDGE_CAPABILITY_NATIVE)) {
 		if (ao2_container_count(snapshot->channels) == 2) {
 			struct ao2_iterator i;
 			RAII_VAR(char *, channel_id, NULL, ao2_cleanup);
@@ -1265,12 +1264,12 @@
 
 static void ast_cel_engine_term(void)
 {
-	stasis_message_router_unsubscribe(cel_state_router);
+	stasis_message_router_unsubscribe_and_join(cel_state_router);
 	cel_state_router = NULL;
 	ao2_cleanup(cel_state_topic);
 	cel_state_topic = NULL;
-	cel_channel_forwarder = stasis_unsubscribe(cel_channel_forwarder);
-	cel_bridge_forwarder = stasis_unsubscribe(cel_bridge_forwarder);
+	cel_channel_forwarder = stasis_unsubscribe_and_join(cel_channel_forwarder);
+	cel_bridge_forwarder = stasis_unsubscribe_and_join(cel_bridge_forwarder);
 	ao2_cleanup(linkedids);
 	linkedids = NULL;
 	ast_cli_unregister(&cli_status);