[asterisk-dev] [Code Review] General cleanup of ConfBridge AMI/CLI commands that no longer affect wait_marked users

Matt Jordan reviewboard at asterisk.org
Sat Feb 23 13:35:51 CST 2013

This is an automatically generated e-mail. To reply, visit:

Review request for Asterisk Developers.


When ConfBridge was refactored to better handle the concept of marked, wait_marked, and normal users co-existing in a conference (thereby implementing a state machine for the conference), the wait_marked users were put into their own list of conference participants, separate from the active users. This list is used for wait_marked users when they are waiting in a conference but no marked user has joined; normal users may have joined at this point however. There are several AMI/CLI commands that affect conference users that were not checking the wait_marked users list:
* CLI/AMI commands that mute/unmute a participant. In this case, wait_marked users have to remain in their particular state and should not be affected - however, the commands would return "Channel not found" as opposed to the appropriate error condition.
* CLI/AMI commands that kick a participant. An admin should always be able to kick a participant out of the conference.

This patch fixes both sets of commands, and cleans up the CLI commands slightly by allowing them to complete a participant name (this was supposed to have been added, but the function call was commented out and wasn't implemented)

This addresses bug AST-1114.


  /branches/11/apps/app_confbridge.c 381912 

Diff: https://reviewboard.asterisk.org/r/2346/diff


Put a waitmarked user in the conference. Verified the mute/unmute CLI output, then kicked him out of the conference.



-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20130223/decbaa34/attachment.htm>

More information about the asterisk-dev mailing list