You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Richard Mudgett 797e403982 confbridge: Fix MOH on simultaneous user entry to a new conference. ... When two users entered a new conference simultaneously, one of the callers hears MOH. This happened if two unmarked users entered simultaneously and also if a waitmarked and a marked user entered simultaneously. * Created a confbridge internal MOH API to eliminate the inlined MOH handling code. Note that the conference mixing bridge needs to be locked when actually starting/stopping MOH because there is a small window between the conference join unsuspend MOH and actually joining the mixing bridge. * Created the concept of suspended MOH so it can be interrupted while conference join announcements to the user and DTMF features can operate. * Suspend any MOH until the user is about to actually join the mixing bridge of the conference. This way any pre-join file playback does not need to worry about MOH. * Made post-join actions only play deferred entry announcement files. Changing the user/conference state during that time is not protected or controlled by the state machine. (closes issue ASTERISK-20606) Reported by: Eugenia Belova Tested by: rmudgett Review: https://reviewboard.asterisk.org/r/2232/ ........ Merged revisions 377992 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@377993 65c4cc65-6c06-0410-ace0-fbb531ad65f3		14 years ago
..
include	confbridge: Fix MOH on simultaneous user entry to a new conference.	14 years ago
conf_config_parser.c	confbridge: Fix some resource leaks on conference teardown.	14 years ago
conf_state.c	confbridge: Fix MOH on simultaneous user entry to a new conference.	14 years ago
conf_state_empty.c	Resolve issues in ConfBridge regarding marked, waitmarked, and unmarked users	14 years ago
conf_state_inactive.c	Resolve issues in ConfBridge regarding marked, waitmarked, and unmarked users	14 years ago
conf_state_multi.c	Resolve issues in ConfBridge regarding marked, waitmarked, and unmarked users	14 years ago
conf_state_multi_marked.c	confbridge: Fix MOH on simultaneous user entry to a new conference.	14 years ago
conf_state_single.c	Resolve issues in ConfBridge regarding marked, waitmarked, and unmarked users	14 years ago
conf_state_single_marked.c	Resolve issues in ConfBridge regarding marked, waitmarked, and unmarked users	14 years ago