[asterisk-commits] rmudgett: trunk r392437 - /trunk/main/bridging.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Jun 21 13:10:28 2013
New Revision: 392437

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=392437
Log:
Add channel optimization interaction with frame hooks BUGBUG comments.

Modified:
    trunk/main/bridging.c

Modified: trunk/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridging.c?view=diff&rev=392437&r1=392436&r2=392437
==============================================================================
--- trunk/main/bridging.c (original)
+++ trunk/main/bridging.c Fri Jun 21 13:10:28 2013
@@ -4499,6 +4499,21 @@
 		return 0;
 	}
 
+/*
+ * BUGBUG Need to take into account frame hooks on the unreal/local channels optimization.
+ *
+ * Frame hooks on the unreal/local channels may inhibit optimization here if they cannot
+ * be moved to an appropriate peer channel.
+ *
+ * caller -- Bridge -- L;1 -- L;2 -- Bridge -- agent
+ * Any frame hooks on L;1 need to be moved to agent channel.
+ * Any frame hooks on L;2 need to be moved to caller channel.
+ *
+ * Moving the frame hooks may cause the hooks to miss a frame if
+ * the destination channel has already read a frame but cannot
+ * write it into the bridge yet because optimization has the
+ * bridge locked.
+ */
 	other = ast_bridge_channel_peer(src_bridge_channel);
 	if (other && other->state == AST_BRIDGE_CHANNEL_STATE_WAIT) {
 		ast_debug(1, "Move-swap optimizing %s <-- %s.\n",
@@ -4602,6 +4617,7 @@
 		return 0;
 	}
 
+/* BUGBUG Frame hooks on the unreal/local channels need to inhibit optimization here. */
 	ast_debug(1, "Merge optimizing %s -- %s out.\n",
 		ast_channel_name(chan_bridge_channel->chan),
 		ast_channel_name(peer_bridge_channel->chan));