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_basic.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'main/bridge_basic.c') diff --git a/main/bridge_basic.c b/main/bridge_basic.c index 103099d8b..aaa77caea 100644 --- a/main/bridge_basic.c +++ b/main/bridge_basic.c @@ -2289,7 +2289,8 @@ static enum attended_transfer_state recalling_exit(struct attended_transfer_prop */ ast_bridge_features_ds_set(props->recall_target, &props->transferer_features); ast_channel_ref(props->recall_target); - if (ast_bridge_impart(props->transferee_bridge, props->recall_target, NULL, NULL, 1)) { + if (ast_bridge_impart(props->transferee_bridge, props->recall_target, NULL, NULL, + AST_BRIDGE_IMPART_CHAN_INDEPENDENT)) { ast_hangup(props->recall_target); return TRANSFER_FAIL; } @@ -2380,7 +2381,8 @@ static int retransfer_enter(struct attended_transfer_properties *props) } ast_channel_ref(props->recall_target); - if (ast_bridge_impart(props->transferee_bridge, props->recall_target, NULL, NULL, 1)) { + if (ast_bridge_impart(props->transferee_bridge, props->recall_target, NULL, NULL, + AST_BRIDGE_IMPART_CHAN_INDEPENDENT)) { ast_log(LOG_ERROR, "Unable to place recall target into bridge\n"); ast_hangup(props->recall_target); return -1; @@ -3067,7 +3069,8 @@ static int feature_attended_transfer(struct ast_bridge_channel *bridge_channel, * choice is to give it a bump */ ast_channel_ref(props->transfer_target); - if (ast_bridge_impart(props->target_bridge, props->transfer_target, NULL, NULL, 1)) { + if (ast_bridge_impart(props->target_bridge, props->transfer_target, NULL, NULL, + AST_BRIDGE_IMPART_CHAN_INDEPENDENT)) { ast_log(LOG_ERROR, "Unable to place transfer target into bridge.\n"); ast_stream_and_wait(bridge_channel->chan, props->failsound, AST_DIGIT_NONE); ast_bridge_channel_write_unhold(bridge_channel); -- cgit v1.2.3