[svn-commits] rmudgett: branch group/bridge_construction r380813 - /team/group/bridge_const...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon Feb  4 13:24:28 2013
New Revision: 380813

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=380813
Log:
Block all control frames for now in the bridging API.

chan_sip tends to defer the ast_indicate() for default behavior with
control frames.  Unfortunately, when the control frame comes in via
ast_write() this has a tendency to hang up the call.

Modified:
    team/group/bridge_construction/main/bridging.c

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=380813&r1=380812&r2=380813
==============================================================================
--- team/group/bridge_construction/main/bridging.c (original)
+++ team/group/bridge_construction/main/bridging.c Mon Feb  4 13:24:28 2013
@@ -369,6 +369,10 @@
 static int bridge_drop_control_frame(int subclass)
 {
 /* BUGBUG I think this code should be removed. Let the bridging tech determine what to do with control frames. */
+#if 1
+	/* Block all control frames. */
+	return 1;
+#else
 	switch (subclass) {
 	case AST_CONTROL_READ_ACTION:
 	case AST_CONTROL_CC:
@@ -384,6 +388,7 @@
 	default:
 		return 0;
 	}
+#endif
 }
 
 void ast_bridge_notify_talking(struct ast_bridge_channel *bridge_channel, int started_talking)