[asterisk-dev] [Code Review]: Revamp app_confbridge into something resembling a state machine

[Matt Jordan]

> On Sept. 21, 2012, 11:11 a.m., Matt Jordan wrote:
> > /branches/10/apps/confbridge/conf_state_multi.c, lines 66-72
> > <https://reviewboard.asterisk.org/r/2072/diff/8/?file=31269#file31269line66>
> >
> >     This transition has the potential to be incorrect.
> >     
> >     Conference is in state MULTI with Marked User One and Unmarked User One.  Unmarked User One leaves the conference.  This changes the state to CONF_STATE_SINGLE, instead of CONF_STATE_SINGLE_MARKED.
> >     
> >     At that point if an active user joins, we'll transition to CONF_STATE_MULTI, instead of CONF_STATE_MULTI_MARKED.
> >     
> >     I'm not sure how far off the tracks this gets, but whenever we have a person leave, we need to make sure that if the last person in the conference is marked, we transition back to the correct SINGLE state.

And this finding is incorrect, because you can't get into CONF_STATE_MULTI with a marked user.

This confused me, since the file names for single are conf_state_single and conf_state_single_marked; while multi are conf_state_multi and conf_state_marked.  Can we make them consistent?  I'd prefer conf_state_multi (where no one is marked) and conf_state_multi_marked (where at least one person is marked)


- Matt


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


On Sept. 17, 2012, 11:51 a.m., Terry Wilson wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/2072/
> -----------------------------------------------------------
> 
> (Updated Sept. 17, 2012, 11:51 a.m.)
> 
> 
> Review request for Asterisk Developers and Neil Tallim.
> 
> 
> Summary
> -------
> 
> Thank's to flan's tireless testing, issue reporting, and patches it became clear that app_confbridge had some complex logic and was missing some corner cases. In particular, it didn't handle mixing unmarked and waitmarked users very well and was inconsistent in how MOH and muting was applied.  flan's patches seem to fix the issue, but they highlight how hard the code could be to maintain. In an attempt to make things easier to maintain and to more fully enumerate the various cases that exist, I have attempted to break up the logic into a state machine-like setup.
> 
> This should fix all of the issues in the linked bugs, as well as a couple of other issues. I still need to add some documentation, but I thought I'd give people a chance to look at it test it out, and comment.
> 
> One thing to note is that this solution involves treating waitmarked users without a marked user as essentially outside of the conference. For now, I have the announce_user_count stuff taking into account both the counts for waiting and active users which can lead to things like having a single waiting user followed by an unmarked user and the announcement that "there is one other user in the conference" (because we count the waiting user there) followed by "you are the only user in the conference" (because that prompt plays when you are the only active user) being played to the unmarked user. This is easy to fix, we just need to decide which way to go. Count users who are essentially outside the conference (they can't speak or hear) or not?
> 
> 
> This addresses bugs ASTERISK-19562, ASTERISK-19726 and ASTERISK-20181.
>     https://issues.asterisk.org/jira/browse/ASTERISK-19562
>     https://issues.asterisk.org/jira/browse/ASTERISK-19726
>     https://issues.asterisk.org/jira/browse/ASTERISK-20181
> 
> 
> Diffs
> -----
> 
>   /branches/10/apps/app_confbridge.c 373118 
>   /branches/10/apps/confbridge/conf_state.c PRE-CREATION 
>   /branches/10/apps/confbridge/conf_state_empty.c PRE-CREATION 
>   /branches/10/apps/confbridge/conf_state_inactive.c PRE-CREATION 
>   /branches/10/apps/confbridge/conf_state_marked.c PRE-CREATION 
>   /branches/10/apps/confbridge/conf_state_multi.c PRE-CREATION 
>   /branches/10/apps/confbridge/conf_state_single.c PRE-CREATION 
>   /branches/10/apps/confbridge/conf_state_single_marked.c PRE-CREATION 
>   /branches/10/apps/confbridge/include/conf_state.h PRE-CREATION 
>   /branches/10/apps/confbridge/include/confbridge.h 373118 
> 
> Diff: https://reviewboard.asterisk.org/r/2072/diff
> 
> 
> Testing
> -------
> 
> Lots of calls. Need to do more formalized testing.
> 
> 
> Thanks,
> 
> Terry
> 
>

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