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

Matt Jordan reviewboard at asterisk.org
Tue Feb 26 09:28:15 CST 2013



> On Feb. 25, 2013, 12:50 p.m., Mark Michelson wrote:
> > /branches/11/apps/app_confbridge.c, lines 2146-2153
> > <https://reviewboard.asterisk.org/r/2346/diff/1/?file=33587#file33587line2146>
> >
> >     Same indentation reduction can be done here.

Same.


> On Feb. 25, 2013, 12:50 p.m., Mark Michelson wrote:
> > /branches/11/apps/app_confbridge.c, lines 2088-2097
> > <https://reviewboard.asterisk.org/r/2346/diff/1/?file=33587#file33587line2088>
> >
> >     You could lose an indentation level here by returning res early if it's zero. Just be sure to unlock the bridge before returning if you do that.
> >     
> >     As a side note, this function would be a great place to use a scoped lock when you merge to trunk.

Fixed on commit; will use a scoped lock in trunk.


- Matt


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/2346/#review7934
-----------------------------------------------------------


On Feb. 23, 2013, 1:35 p.m., Matt Jordan wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/2346/
> -----------------------------------------------------------
> 
> (Updated Feb. 23, 2013, 1:35 p.m.)
> 
> 
> Review request for Asterisk Developers.
> 
> 
> Summary
> -------
> 
> 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.
>     https://issues.asterisk.org/jira/browse/AST-1114
> 
> 
> Diffs
> -----
> 
>   /branches/11/apps/app_confbridge.c 381912 
> 
> Diff: https://reviewboard.asterisk.org/r/2346/diff
> 
> 
> Testing
> -------
> 
> Put a waitmarked user in the conference. Verified the mute/unmute CLI output, then kicked him out of the conference.
> 
> 
> Thanks,
> 
> Matt
> 
>

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


More information about the asterisk-dev mailing list