[asterisk-commits] rmudgett: branch group/bridge_construction r384121 - in /team/group/bridge_co...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Mar 27 14:07:34 2013
New Revision: 384121

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384121
Log:
Resolve a BUGBUG note.

Modified:
    team/group/bridge_construction/include/asterisk/bridging.h
    team/group/bridge_construction/main/bridging.c

Modified: team/group/bridge_construction/include/asterisk/bridging.h
URL: http://svnview.digium.com/svn/asterisk/team/group/bridge_construction/include/asterisk/bridging.h?view=diff&rev=384121&r1=384120&r2=384121
==============================================================================
--- team/group/bridge_construction/include/asterisk/bridging.h (original)
+++ team/group/bridge_construction/include/asterisk/bridging.h Wed Mar 27 14:07:34 2013
@@ -187,8 +187,15 @@
 	AST_BRIDGE_ACTION_TALKING_START,
 	/*! Bridged channel is to indicate talking stop */
 	AST_BRIDGE_ACTION_TALKING_STOP,
+
+	/*
+	 * Bridge actions put after this comment must never be put onto
+	 * the bridge_channel wr_queue because they have other resources
+	 * that must be freed.
+	 */
+
 	/*! Bridge reconfiguration deferred technology destruction. */
-	AST_BRIDGE_ACTION_DEFERRED_TECH_DESTROY,
+	AST_BRIDGE_ACTION_DEFERRED_TECH_DESTROY = 1000,
 };
 
 enum ast_bridge_video_mode_type {

Modified: team/group/bridge_construction/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bridge_construction/main/bridging.c?view=diff&rev=384121&r1=384120&r2=384121
==============================================================================
--- team/group/bridge_construction/main/bridging.c (original)
+++ team/group/bridge_construction/main/bridging.c Wed Mar 27 14:07:34 2013
@@ -1893,9 +1893,8 @@
 
 	ast_bridge_unlock(bridge_channel->bridge);
 
-	/* Flush any unhandled frames. */
+	/* Flush any unhandled wr_queue frames. */
 	ast_bridge_channel_lock(bridge_channel);
-/* BUGBUG need to destroy unused bridge action frames specially since they can have referenced pointers. */
 	while ((fr = AST_LIST_REMOVE_HEAD(&bridge_channel->wr_queue, frame_list))) {
 		ast_frfree(fr);
 	}