diff options
author | Richard Mudgett <rmudgett@digium.com> | 2013-09-13 22:19:23 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2013-09-13 22:19:23 +0000 |
commit | 2a371cd80bfb88552d2f42545718da2489e1a5ba (patch) | |
tree | 188cc0f08f5ef185f215cf2d07ea59f5164311f0 /tests/test_cel.c | |
parent | 03c7857375b475883a81141da05ca2d2376bf066 (diff) |
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
Diffstat (limited to 'tests/test_cel.c')
-rw-r--r-- | tests/test_cel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_cel.c b/tests/test_cel.c index d440ebf53..c084ce394 100644 --- a/tests/test_cel.c +++ b/tests/test_cel.c @@ -109,7 +109,7 @@ static void do_sleep(void) } while (0) #define BRIDGE_EXIT(channel, bridge) do { \ - ast_test_validate(test, 0 == ast_bridge_depart(channel)); \ + ast_test_validate(test, !ast_bridge_depart(channel)); \ BRIDGE_EXIT_EVENT(channel, bridge); \ mid_test_sync(); \ } while (0) @@ -129,7 +129,7 @@ static void do_sleep(void) } while (0) #define BRIDGE_ENTER(channel, bridge) do { \ - ast_test_validate(test, 0 == ast_bridge_impart(bridge, channel, NULL, NULL, 0)); \ + ast_test_validate(test, !ast_bridge_impart(bridge, channel, NULL, NULL, AST_BRIDGE_IMPART_CHAN_DEPARTABLE)); \ do_sleep(); \ BRIDGE_ENTER_EVENT(channel, bridge); \ mid_test_sync(); \ @@ -1417,7 +1417,7 @@ AST_TEST_DEFINE(test_cel_dial_pickup) ast_test_validate(test, extra != NULL); APPEND_EVENT(chan_callee, AST_CEL_PICKUP, NULL, extra); - ast_test_validate(test, 0 == ast_do_pickup(chan_charlie, chan_callee)); + ast_test_validate(test, !ast_do_pickup(chan_charlie, chan_callee)); } /* Hang up the masqueraded zombie */ |