[asterisk-commits] file: branch file/bridging r117369 - in /team/file/bridging: apps/ main/

[SVN commits to the Asterisk project]

Author: file
Date: Tue May 20 21:29:03 2008
New Revision: 117369

URL: http://svn.digium.com/view/asterisk?view=rev&rev=117369
Log:
Get features working again and temporarily enable attended transfers on participants who join a conference bridge.

Modified:
    team/file/bridging/apps/app_confbridge.c
    team/file/bridging/main/bridging.c

Modified: team/file/bridging/apps/app_confbridge.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_confbridge.c?view=diff&rev=117369&r1=117368&r2=117369
==============================================================================
--- team/file/bridging/apps/app_confbridge.c (original)
+++ team/file/bridging/apps/app_confbridge.c Tue May 20 21:29:03 2008
@@ -636,6 +636,8 @@
 		ast_bridge_features_hook(&conference_bridge_user.features, "#", menu_callback, &conference_bridge_user);
 	}
 
+	ast_bridge_features_enable(&conference_bridge_user.features, AST_BRIDGE_BUILTIN_ATTENDEDTRANSFER, "*");
+
 	/* If the caller should be joined already muted, make it so */
 	if (ast_test_flag(&conference_bridge_user.flags, OPTION_STARTMUTED)) {
 		conference_bridge_user.features.mute = 1;

Modified: team/file/bridging/main/bridging.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/main/bridging.c?view=diff&rev=117369&r1=117368&r2=117369
==============================================================================
--- team/file/bridging/main/bridging.c (original)
+++ team/file/bridging/main/bridging.c Tue May 20 21:29:03 2008
@@ -703,6 +703,10 @@
 		}
 		/* Execute the threading model */
 		state = (bridge_channel->bridge->technology->capabilities & AST_BRIDGE_CAPABILITY_MULTITHREADED ? bridge_channel_join_multithreaded(bridge_channel) : bridge_channel_join_singlethreaded(bridge_channel));
+		/* Depending on the above state see what we need to do */
+		if (state == AST_BRIDGE_CHANNEL_STATE_FEATURE) {
+			bridge_channel_feature(bridge_channel->bridge, bridge_channel);
+		}
 	}
 
 	/* Tell the bridge to rebuild as we are leaving */