From 2a371cd80bfb88552d2f42545718da2489e1a5ba Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Fri, 13 Sep 2013 22:19:23 +0000 Subject: Restore Dial, Queue, and FollowMe 'I' option support. The Dial, Queue, and FollowMe applications need to inhibit the bridging initial connected line exchange in order to support the 'I' option. * Replaced the pass_reference flag on ast_bridge_join() with a flags parameter to pass other flags defined by enum ast_bridge_join_flags. * Replaced the independent flag on ast_bridge_impart() with a flags parameter to pass other flags defined by enum ast_bridge_impart_flags. * Since the Dial, Queue, and FollowMe applications are now the only callers of ast_bridge_call() and ast_bridge_call_with_flags(), changed the calling contract to require the initial COLP exchange to already have been done by the caller. * Made all callers of ast_bridge_impart() check the return value. It is important. As a precaution, I also made the compiler complain now if it is not checked. * Did some cleanup in parking_tests.c as a result of checking the ast_bridge_impart() return value. An independent, but associated change is: * Reduce stack usage in ast_indicate_data() and add a dropping redundant connected line verbose message. (closes issue ASTERISK-22072) Reported by: Joshua Colp Review: https://reviewboard.asterisk.org/r/2845/ ........ Merged revisions 399136 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@399138 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/bridge_channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/bridge_channel.c') diff --git a/main/bridge_channel.c b/main/bridge_channel.c index 1aa82abfc..2917e83c5 100644 --- a/main/bridge_channel.c +++ b/main/bridge_channel.c @@ -2000,7 +2000,7 @@ int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel) BRIDGE_CHANNEL_STATE_END_NO_DISSOLVE, bridge_channel->bridge->cause); res = -1; } - bridge_reconfigured(bridge_channel->bridge, 1); + bridge_reconfigured(bridge_channel->bridge, !bridge_channel->inhibit_colp); if (bridge_channel->state == BRIDGE_CHANNEL_STATE_WAIT) { /* -- cgit v1.2.3