[svn-commits] file: branch file/bridging r161529 - /team/file/bridging/main/bridging.c

[SVN commits to the Digium repositories]

Author: file
Date: Fri Dec  5 18:50:17 2008
New Revision: 161529

URL: http://svn.digium.com/view/asterisk?view=rev&rev=161529
Log:
This got lost in the shuffle. Make sure a pointer to the bridge itself is also on the channel structure.

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

Modified: team/file/bridging/main/bridging.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/main/bridging.c?view=diff&rev=161529&r1=161528&r2=161529
==============================================================================
--- team/file/bridging/main/bridging.c (original)
+++ team/file/bridging/main/bridging.c Fri Dec  5 18:50:17 2008
@@ -814,6 +814,8 @@
 
 	/* Actually execute the respective threading model, and keep our bridge thread alive */
 	while (bridge_channel->state == AST_BRIDGE_CHANNEL_STATE_WAIT) {
+		/* Update bridge pointer on channel */
+		bridge_channel->chan->bridge = bridge_channel->bridge;
 		/* If the technology requires a thread and one is not running, start it up */
 		if (bridge_channel->bridge->thread == AST_PTHREADT_NULL && (bridge_channel->bridge->technology->capabilities & AST_BRIDGE_CAPABILITY_THREAD)) {
 			bridge_channel->bridge->stop = 0;
@@ -839,6 +841,8 @@
 		}
 	}
 
+	bridge_channel->chan->bridge = NULL;
+
 	/* See if we need to dissolve the bridge itself if they hung up */
 	if (bridge_channel->state == AST_BRIDGE_CHANNEL_STATE_END) {
 		bridge_check_dissolve(bridge_channel->bridge, bridge_channel);